fixup username: its jenkins everywhere. fix distros for edu

9 files changed, 18 insertions, 18 deletions

diff --git a/d-i-preseed-cfgs/debian-edu_squeeze-test_combi-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_squeeze-test_combi-server_preseed.cfg
index 886485ce..487f16ed 100644
--- a/d-i-preseed-cfgs/debian-edu_squeeze-test_combi-server_preseed.cfg
+++ b/d-i-preseed-cfgs/debian-edu_squeeze-test_combi-server_preseed.cfg
@@ -1,4 +1,4 @@
-#### Contents of the preconfiguration file for Debian Edu squeeze
+#### Contents of the preconfiguration file for Debian Edu squeeze-test
 ### Localization
 # Preseeding only locale sets language, country and locale.
 d-i debian-installer/locale string en_US
@@ -393,7 +393,7 @@ d-i debian-edu-install/participate-popcon boolean false
 
 # Tell LTSP to not use the CDROM, but a HTTP mirror
 d-i ltsp-client-builder/use_cdrom boolean false
-d-i ltsp-client-builder/build-client-opts string --mirror http://ftp.skolelinux.org/debian --dist squeeze
+d-i ltsp-client-builder/build-client-opts string --mirror http://ftp.skolelinux.org/debian --dist squeeze-test
 
 portmap portmap/loopback boolean false
 
diff --git a/d-i-preseed-cfgs/debian-edu_squeeze-test_standalone_preseed.cfg b/d-i-preseed-cfgs/debian-edu_squeeze-test_standalone_preseed.cfg
index 963002cb..342c4024 100644
--- a/d-i-preseed-cfgs/debian-edu_squeeze-test_standalone_preseed.cfg
+++ b/d-i-preseed-cfgs/debian-edu_squeeze-test_standalone_preseed.cfg
@@ -1,4 +1,4 @@
-#### Contents of the preconfiguration file for Debian Edu squeeze
+#### Contents of the preconfiguration file for Debian Edu squeeze-test
 ### Localization
 # Preseeding only locale sets language, country and locale.
 d-i debian-installer/locale string en_US
@@ -393,7 +393,7 @@ d-i debian-edu-install/participate-popcon boolean false
 
 # Tell LTSP to not use the CDROM, but a HTTP mirror
 d-i ltsp-client-builder/use_cdrom boolean false
-d-i ltsp-client-builder/build-client-opts string --mirror http://ftp.skolelinux.org/debian --dist squeeze
+d-i ltsp-client-builder/build-client-opts string --mirror http://ftp.skolelinux.org/debian --dist squeeze-test
 
 portmap portmap/loopback boolean false
 
diff --git a/d-i-preseed-cfgs/debian-edu_squeeze-test_workstation_preseed.cfg b/d-i-preseed-cfgs/debian-edu_squeeze-test_workstation_preseed.cfg
index a6e5aec6..b4274731 100644
--- a/d-i-preseed-cfgs/debian-edu_squeeze-test_workstation_preseed.cfg
+++ b/d-i-preseed-cfgs/debian-edu_squeeze-test_workstation_preseed.cfg
@@ -1,4 +1,4 @@
-#### Contents of the preconfiguration file for Debian Edu squeeze
+#### Contents of the preconfiguration file for Debian Edu squeeze-test
 ### Localization
 # Preseeding only locale sets language, country and locale.
 d-i debian-installer/locale string en_US
@@ -393,7 +393,7 @@ d-i debian-edu-install/participate-popcon boolean false
 
 # Tell LTSP to not use the CDROM, but a HTTP mirror
 d-i ltsp-client-builder/use_cdrom boolean false
-d-i ltsp-client-builder/build-client-opts string --mirror http://ftp.skolelinux.org/debian --dist squeeze
+d-i ltsp-client-builder/build-client-opts string --mirror http://ftp.skolelinux.org/debian --dist squeeze-test
 
 portmap portmap/loopback boolean false
 
diff --git a/d-i-preseed-cfgs/debian-edu_wheezy-test_combi-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_wheezy-test_combi-server_preseed.cfg
index f3873101..79933113 100644
--- a/d-i-preseed-cfgs/debian-edu_wheezy-test_combi-server_preseed.cfg
+++ b/d-i-preseed-cfgs/debian-edu_wheezy-test_combi-server_preseed.cfg
@@ -1,4 +1,4 @@
-#### Contents of the preconfiguration file for Debian Edu wheezy
+#### Contents of the preconfiguration file for Debian Edu wheezy-test
 ### Localization
 # Preseeding only locale sets language, country and locale.
 d-i debian-installer/locale string en_US
@@ -393,7 +393,7 @@ d-i debian-edu-install/participate-popcon boolean false
 
 # Tell LTSP to not use the CDROM, but a HTTP mirror
 d-i ltsp-client-builder/use_cdrom boolean false
-d-i ltsp-client-builder/build-client-opts string --mirror http://ftp.skolelinux.org/debian --dist squeeze
+d-i ltsp-client-builder/build-client-opts string --mirror http://ftp.skolelinux.org/debian --dist wheezy-test
 
 portmap portmap/loopback boolean false
 
diff --git a/d-i-preseed-cfgs/debian-edu_wheezy-test_standalone_preseed.cfg b/d-i-preseed-cfgs/debian-edu_wheezy-test_standalone_preseed.cfg
index 0fd19a60..84f180c9 100644
--- a/d-i-preseed-cfgs/debian-edu_wheezy-test_standalone_preseed.cfg
+++ b/d-i-preseed-cfgs/debian-edu_wheezy-test_standalone_preseed.cfg
@@ -1,4 +1,4 @@
-#### Contents of the preconfiguration file for Debian Edu wheezy
+#### Contents of the preconfiguration file for Debian Edu wheezy-test
 ### Localization
 # Preseeding only locale sets language, country and locale.
 d-i debian-installer/locale string en_US
@@ -393,7 +393,7 @@ d-i debian-edu-install/participate-popcon boolean false
 
 # Tell LTSP to not use the CDROM, but a HTTP mirror
 d-i ltsp-client-builder/use_cdrom boolean false
-d-i ltsp-client-builder/build-client-opts string --mirror http://ftp.skolelinux.org/debian --dist squeeze
+d-i ltsp-client-builder/build-client-opts string --mirror http://ftp.skolelinux.org/debian --dist wheezy-test
 
 portmap portmap/loopback boolean false
 
diff --git a/d-i-preseed-cfgs/debian-edu_wheezy-test_sugar_preseed.cfg b/d-i-preseed-cfgs/debian-edu_wheezy-test_sugar_preseed.cfg
index bb03206e..fb950acd 100644
--- a/d-i-preseed-cfgs/debian-edu_wheezy-test_sugar_preseed.cfg
+++ b/d-i-preseed-cfgs/debian-edu_wheezy-test_sugar_preseed.cfg
@@ -1,4 +1,4 @@
-#### Contents of the preconfiguration file for Debian Edu wheezy
+#### Contents of the preconfiguration file for Debian Edu wheezy-test
 ### Localization
 # Preseeding only locale sets language, country and locale.
 d-i debian-installer/locale string en_US
@@ -393,7 +393,7 @@ d-i debian-edu-install/participate-popcon boolean false
 
 # Tell LTSP to not use the CDROM, but a HTTP mirror
 d-i ltsp-client-builder/use_cdrom boolean false
-d-i ltsp-client-builder/build-client-opts string --mirror http://ftp.skolelinux.org/debian --dist squeeze
+d-i ltsp-client-builder/build-client-opts string --mirror http://ftp.skolelinux.org/debian --dist wheezy-test
 
 portmap portmap/loopback boolean false
 
diff --git a/d-i-preseed-cfgs/debian-edu_wheezy-test_workstation_preseed.cfg b/d-i-preseed-cfgs/debian-edu_wheezy-test_workstation_preseed.cfg
index c53fa2de..238c9124 100644
--- a/d-i-preseed-cfgs/debian-edu_wheezy-test_workstation_preseed.cfg
+++ b/d-i-preseed-cfgs/debian-edu_wheezy-test_workstation_preseed.cfg
@@ -1,4 +1,4 @@
-#### Contents of the preconfiguration file for Debian Edu wheezy
+#### Contents of the preconfiguration file for Debian Edu wheezy-test
 ### Localization
 # Preseeding only locale sets language, country and locale.
 d-i debian-installer/locale string en_US
@@ -393,7 +393,7 @@ d-i debian-edu-install/participate-popcon boolean false
 
 # Tell LTSP to not use the CDROM, but a HTTP mirror
 d-i ltsp-client-builder/use_cdrom boolean false
-d-i ltsp-client-builder/build-client-opts string --mirror http://ftp.skolelinux.org/debian --dist squeeze
+d-i ltsp-client-builder/build-client-opts string --mirror http://ftp.skolelinux.org/debian --dist wheezy-test
 
 portmap portmap/loopback boolean false
 
diff --git a/d-i-preseed-cfgs/debian_sid_daily-lxde_preseed.cfg b/d-i-preseed-cfgs/debian_sid_daily-lxde_preseed.cfg
index 2eafa8e8..184668f4 100644
--- a/d-i-preseed-cfgs/debian_sid_daily-lxde_preseed.cfg
+++ b/d-i-preseed-cfgs/debian_sid_daily-lxde_preseed.cfg
@@ -105,8 +105,8 @@ d-i passwd/root-password-again password r00tme
 #d-i passwd/root-password-crypted password [MD5 hash]
 
 # To create a normal user account.
-d-i passwd/user-fullname string Debian User
-d-i passwd/username string debian
+d-i passwd/user-fullname string Jenkins Testuser
+d-i passwd/username string jenkins
 # Normal user's password, either in clear text
 d-i passwd/user-password password insecure
 d-i passwd/user-password-again password insecure
diff --git a/d-i-preseed-cfgs/debian_wheezy_kde_preseed.cfg b/d-i-preseed-cfgs/debian_wheezy_kde_preseed.cfg
index 2bfb24f8..e72186f5 100644
--- a/d-i-preseed-cfgs/debian_wheezy_kde_preseed.cfg
+++ b/d-i-preseed-cfgs/debian_wheezy_kde_preseed.cfg
@@ -105,8 +105,8 @@ d-i passwd/root-password-again password r00tme
 #d-i passwd/root-password-crypted password [MD5 hash]
 
 # To create a normal user account.
-d-i passwd/user-fullname string Debian User
-d-i passwd/username string debian
+d-i passwd/user-fullname string Jenkins Testuser
+d-i passwd/username string jenkins
 # Normal user's password, either in clear text
 d-i passwd/user-password password insecure
 d-i passwd/user-password-again password insecure