[debian-edu-commits] r80028 - branches/wheezy/debian-edu-config/share/debian-edu-config/tools

[pere at alioth.debian.org]

Author: pere
Date: 2013-05-08 16:52:11 +0000 (Wed, 08 May 2013)
New Revision: 80028

Modified:
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/bless-debian
Log:
Make bless-debian more robust and fix a few typos.

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/tools/bless-debian
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/tools/bless-debian	2013-05-08 16:20:22 UTC (rev 80027)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/bless-debian	2013-05-08 16:52:11 UTC (rev 80028)
@@ -23,9 +23,10 @@
     fi
 fi
 
-# Any version string will do, just use the latest one from an existing
-# installation.
-VERSION="7.0.0+edua0"
+# Any version string will do.  If an old and official version string
+# like terra_alpha is used, it will be replaced by debian-edu-install
+# during installation to the current version.
+VERSION="terra_alpha"
 
 # Set this if you want to run the testsuite after first boot, and use
 # the test version of the APT repositories.
@@ -76,7 +77,7 @@
 
 # 1. Add skolelinux related APT sources.
 apt-get install -y debian-edu-archive-keyring
-cat <<EOF >/etc/apt/sources.list.d/debian-edu
+cat <<EOF >/etc/apt/sources.list.d/debian-edu.list
 deb http://ftp.skolelinux.org/skolelinux wheezy-test local
 deb-src http://ftp.skolelinux.org/skolelinux wheezy-test local
 EOF
@@ -90,7 +91,7 @@
 LOCALE="$LANG"
 EOF
 
-if [ 'true' == "$TESTINSTALL" ] ; then
+if [ "true" == "$TESTINSTALL" ] ; then
     echo 'TESTINSTALL="true"' >> /etc/debian-edu/config
 fi
 
@@ -101,6 +102,8 @@
 # 4. Run tasksel to install packages according to the profile
 #    specified in the config above, overriding some of the Debian
 #    automation machinery.
+echo debian-edu-install debian-edu-install/profile multiselect "$PROFILE" | \
+    debconf-set-selections
 setup_tasksel_overrides
 tasksel --new-install
 remove_tasksel_overrides
@@ -111,6 +114,6 @@
 etckeeper commit "/etc/ state after running cfengine-debian-edu."
 
 # 6. Reboot
-echo "It is now time to reboot. For example by running
+echo "It is now time to reboot. For example by running"
 echo "  shutdown -r now 'Into the great wide open'"
 exit 0