cleanup previous commit a bit and also use the opportunity to cleanup other related stuff

1 files changed, 7 insertions, 1 deletions

diff --git a/userContent/debian-edu-squeeze-test-standalone-preseed.cfg b/userContent/debian-edu-squeeze-test-standalone-preseed.cfg
index deb0ae86..3470c0f4 100644
--- a/userContent/debian-edu-squeeze-test-standalone-preseed.cfg
+++ b/userContent/debian-edu-squeeze-test-standalone-preseed.cfg
@@ -327,7 +327,7 @@ d-i debian-edu-install/confirm boolean true
 # installed, and what software you use. The default is not to report back,
 # but sending reports helps the project determine what software is most
 # popular and include it on CDs.
-d-i debian-edu-install/participate-popcon boolean false
+#popularity-contest popularity-contest/participate boolean false
 
 ### Finishing up the installation
 # During installations from serial console, the regular virtual consoles
@@ -385,6 +385,12 @@ d-i debian-installer/exit/poweroff boolean true
 # edu specific settings
 #
 
+# the popcon question needs special preseeding as the template
+# being shown is the one in debian-edu-install, which is copied from
+# popularity-contest to ensure all questions show up before packages are
+# 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