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

[pere at alioth.debian.org]

Author: pere
Date: 2013-05-08 15:06:33 +0000 (Wed, 08 May 2013)
New Revision: 80026

Modified:
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/bless-debian
Log:
Parameterize bless-debian.

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 14:37:03 UTC (rev 80025)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/bless-debian	2013-05-08 15:06:33 UTC (rev 80026)
@@ -12,6 +12,23 @@
 
 set -e
 
+# Install with these settings
+PROFILE="Workstation"
+
+LANG="nb_NO.UTF-8"
+LANGUAGE="nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en"
+
+# Any version string will do, just use the latest one from an existing
+# installation.
+VERSION="7.0.0+edua0"
+
+# Set this if you want to run the testsuite after first boot, and use
+# the test version of the APT repositories.
+TESTINSTALL="true"
+
+# Make sure the locale settings are visible
+export LANG LANGUAGE
+
 setup_tasksel_overrides() {
     # Modify tasksels desktop test so the normal Debian desktop
     # profiles are not installed. Use dpkg-divert to to switch to our
@@ -62,18 +79,16 @@
 # 2. Create /etc/debian-edu/config, for example like this:
 mkdir -p /etc/debian-edu
 cat <<EOF > /etc/debian-edu/config
-# Any version string will do, just copy the latest one from an existing
-# installation.
-VERSION="7.0.0+edua0"
-# Or any other profile you want to install
-PROFILE="Workstation"
-# Language selectoins
-LANGCODE="nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en"
-LOCALE="nb_NO.UTF-8"
-# Should the test suite run after first boot or not?
-TESTINSTALL="true"
+VERSION="$VERSION"
+PROFILE="$PROFILE"
+LANGCODE="$LANGUAGE"
+LOCALE="$LANG"
 EOF
 
+if [ 'true' == "$TESTINSTALL" ] ; then
+    echo 'TESTINSTALL="true"' >> /etc/debian-edu/config
+fi
+
 # 3. Install debian-edu-install to load preseeding values and pull in
 #    our configuration..
 apt-get install -y debian-edu-install