improve preseeding for Debian Edu, thanks to Wolfgang Schweer for some suggestions

11 files changed, 20 insertions, 48 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 10efbea3..d8958038 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
@@ -396,7 +396,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-test
+d-i ltsp-client-builder/build-client-opts string --mirror http://ftp.skolelinux.org/debian --dist squeeze --extra-mirror http://ftp.skolelinux.org/skolelinux
 
 portmap portmap/loopback boolean false
 
@@ -404,4 +404,4 @@ nslcd nslcd/ldap-base string dc=skole,dc=skolelinux,dc=no
 nslcd nslcd/ldap-uris string DNS
 
 # Workaround (FIXME: bug number needed) bug in dictionary-common for strange question showing up for some languages
-dictionaries-common dictionaries-common/default-wordlist Manual symlinks setting
+dictionaries-common dictionaries-common/default-wordlist Manual symlink setting
diff --git a/d-i-preseed-cfgs/debian-edu_squeeze-test_main-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_squeeze-test_main-server_preseed.cfg
index f0501fec..87b0deb9 100644
--- a/d-i-preseed-cfgs/debian-edu_squeeze-test_main-server_preseed.cfg
+++ b/d-i-preseed-cfgs/debian-edu_squeeze-test_main-server_preseed.cfg
@@ -400,4 +400,4 @@ nslcd nslcd/ldap-base string dc=skole,dc=skolelinux,dc=no
 nslcd nslcd/ldap-uris string DNS
 
 # Workaround (FIXME: bug number needed) bug in dictionary-common for strange question showing up for some languages
-dictionaries-common dictionaries-common/default-wordlist Manual symlinks setting
+dictionaries-common dictionaries-common/default-wordlist Manual symlink setting
diff --git a/d-i-preseed-cfgs/debian-edu_squeeze-test_minimal_preseed.cfg b/d-i-preseed-cfgs/debian-edu_squeeze-test_minimal_preseed.cfg
index 1fe3c208..b3e4f622 100644
--- a/d-i-preseed-cfgs/debian-edu_squeeze-test_minimal_preseed.cfg
+++ b/d-i-preseed-cfgs/debian-edu_squeeze-test_minimal_preseed.cfg
@@ -391,14 +391,10 @@ d-i debian-installer/exit/poweroff boolean true
 # downloaded.
 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-test
-
 portmap portmap/loopback boolean false
 
 nslcd nslcd/ldap-base string dc=skole,dc=skolelinux,dc=no
 nslcd nslcd/ldap-uris string DNS
 
 # Workaround (FIXME: bug number needed) bug in dictionary-common for strange question showing up for some languages
-dictionaries-common dictionaries-common/default-wordlist Manual symlinks setting
+dictionaries-common dictionaries-common/default-wordlist Manual symlink setting
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 f667daa1..3fdac573 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
@@ -396,14 +396,10 @@ d-i debian-installer/exit/poweroff boolean true
 # downloaded.
 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-test
-
 portmap portmap/loopback boolean false
 
 nslcd nslcd/ldap-base string dc=skole,dc=skolelinux,dc=no
 nslcd nslcd/ldap-uris string DNS
 
 # Workaround (FIXME: bug number needed) bug in dictionary-common for strange question showing up for some languages
-dictionaries-common dictionaries-common/default-wordlist Manual symlinks setting
+dictionaries-common dictionaries-common/default-wordlist Manual symlink setting
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 5132d810..f0d2d224 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
@@ -391,14 +391,10 @@ d-i debian-installer/exit/poweroff boolean true
 # downloaded.
 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-test
-
 portmap portmap/loopback boolean false
 
 nslcd nslcd/ldap-base string dc=skole,dc=skolelinux,dc=no
 nslcd nslcd/ldap-uris string DNS
 
 # Workaround (FIXME: bug number needed) bug in dictionary-common for strange question showing up for some languages
-dictionaries-common dictionaries-common/default-wordlist Manual symlinks setting
+dictionaries-common dictionaries-common/default-wordlist Manual symlink setting
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 fe23ee93..880769f2 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
@@ -390,12 +390,12 @@ 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 wheezy-test
+d-i ltsp-client-builder/build-client-opts string --mirror http://ftp.skolelinux.org/debian --dist wheezy --extra-mirror http://ftp.skolelinux.org/skolelinux
 
-portmap portmap/loopback boolean false
+rpcbind rpcbind/loopback boolean false
 
 nslcd nslcd/ldap-base string dc=skole,dc=skolelinux,dc=no
 nslcd nslcd/ldap-uris string DNS
 
 # Workaround (FIXME: bug number needed) bug in dictionary-common for strange question showing up for some languages
-dictionaries-common dictionaries-common/default-wordlist Manual symlinks setting
+dictionaries-common dictionaries-common/default-wordlist Manual symlink setting
diff --git a/d-i-preseed-cfgs/debian-edu_wheezy-test_main-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_wheezy-test_main-server_preseed.cfg
index a41b8832..6478cdb2 100644
--- a/d-i-preseed-cfgs/debian-edu_wheezy-test_main-server_preseed.cfg
+++ b/d-i-preseed-cfgs/debian-edu_wheezy-test_main-server_preseed.cfg
@@ -388,10 +388,10 @@ d-i debian-installer/exit/poweroff boolean true
 # downloaded.
 d-i debian-edu-install/participate-popcon boolean false
 
-portmap portmap/loopback boolean false
+rpcbind rpcbind/loopback boolean false
 
-nslcd nslcd/ldap-base string dc=skole,dc=skolelinux,dc=no
+pslcd nslcd/ldap-base string dc=skole,dc=skolelinux,dc=no
 nslcd nslcd/ldap-uris string DNS
 
 # Workaround (FIXME: bug number needed) bug in dictionary-common for strange question showing up for some languages
-dictionaries-common dictionaries-common/default-wordlist Manual symlinks setting
+dictionaries-common dictionaries-common/default-wordlist Manual symlink setting
diff --git a/d-i-preseed-cfgs/debian-edu_wheezy-test_minimal_preseed.cfg b/d-i-preseed-cfgs/debian-edu_wheezy-test_minimal_preseed.cfg
index 65de1169..cc732698 100644
--- a/d-i-preseed-cfgs/debian-edu_wheezy-test_minimal_preseed.cfg
+++ b/d-i-preseed-cfgs/debian-edu_wheezy-test_minimal_preseed.cfg
@@ -388,14 +388,10 @@ d-i debian-installer/exit/poweroff boolean true
 # downloaded.
 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 wheezy-test
-
-portmap portmap/loopback boolean false
+rpcbind rpcbind/loopback boolean false
 
 nslcd nslcd/ldap-base string dc=skole,dc=skolelinux,dc=no
 nslcd nslcd/ldap-uris string DNS
 
 # Workaround (FIXME: bug number needed) bug in dictionary-common for strange question showing up for some languages
-dictionaries-common dictionaries-common/default-wordlist Manual symlinks setting
+dictionaries-common dictionaries-common/default-wordlist Manual symlink setting
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 25312786..3ba282a0 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
@@ -388,14 +388,10 @@ d-i debian-installer/exit/poweroff boolean true
 # downloaded.
 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 wheezy-test
-
-portmap portmap/loopback boolean false
+rpcbind rpcbind/loopback boolean false
 
 nslcd nslcd/ldap-base string dc=skole,dc=skolelinux,dc=no
 nslcd nslcd/ldap-uris string DNS
 
 # Workaround (FIXME: bug number needed) bug in dictionary-common for strange question showing up for some languages
-dictionaries-common dictionaries-common/default-wordlist Manual symlinks setting
+dictionaries-common dictionaries-common/default-wordlist Manual symlink setting
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 862f97f7..1ef82b03 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
@@ -388,14 +388,10 @@ d-i debian-installer/exit/poweroff boolean true
 # downloaded.
 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 wheezy-test
-
-portmap portmap/loopback boolean false
+rpcbind rpcbind/loopback boolean false
 
 nslcd nslcd/ldap-base string dc=skole,dc=skolelinux,dc=no
 nslcd nslcd/ldap-uris string DNS
 
 # Workaround (FIXME: bug number needed) bug in dictionary-common for strange question showing up for some languages
-dictionaries-common dictionaries-common/default-wordlist Manual symlinks setting
+dictionaries-common dictionaries-common/default-wordlist Manual symlink setting
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 b2a35ac8..8e709e0a 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
@@ -388,14 +388,10 @@ d-i debian-installer/exit/poweroff boolean true
 # downloaded.
 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 wheezy-test
-
-portmap portmap/loopback boolean false
+rpcbind rpcbind/loopback boolean false
 
 nslcd nslcd/ldap-base string dc=skole,dc=skolelinux,dc=no
 nslcd nslcd/ldap-uris string DNS
 
 # Workaround (FIXME: bug number needed) bug in dictionary-common for strange question showing up for some languages
-dictionaries-common dictionaries-common/default-wordlist Manual symlinks setting
+dictionaries-common dictionaries-common/default-wordlist Manual symlink setting