[debian-edu-commits] r80124 - in branches/wheezy/debian-edu-config: debian share/debian-edu-config/tools

[pere at alioth.debian.org]

Author: pere
Date: 2013-05-18 07:48:12 +0000 (Sat, 18 May 2013)
New Revision: 80124

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless
Log:
Make debian-edu-bless more robust and make it possible to adjust
parameters using environment variables.  Document in a comment at
the top how to do this.


Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-05-17 21:42:53 UTC (rev 80123)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-05-18 07:48:12 UTC (rev 80124)
@@ -1,3 +1,12 @@
+debian-edu-config (1.705~svn80123) unstable; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Make debian-edu-bless more robust and make it possible to adjust
+    parameters using environment variables.  Document in a comment at
+    the top how to do this.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Sat, 18 May 2013 09:41:59 +0200
+
 debian-edu-config (1.704) unstable; urgency=low
 
   [ Wolfgang Schweer ]

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless	2013-05-17 21:42:53 UTC (rev 80123)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless	2013-05-18 07:48:12 UTC (rev 80124)
@@ -8,7 +8,12 @@
 # normal Debian Edu installation, due to preseeding happening too
 # late.
 #
-# This script must run as root.
+# To customize the settings, set environment variables when calling
+# the script, for example like this:
+#   PROFILE=Main-Server,Workstation \
+#     DESKTOP=gnome,lxde \
+#     EDUSUITE=squeeze-test
+#     ./debian-edu-bless
 
 set -e
 set -x
@@ -17,11 +22,11 @@
 # Possible values, can be combined using comma
 #   Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server,
 #   Minimal, Standalone
-PROFILE="Workstation"
+PROFILE="${PROFILE:-Workstation}"
 
 # Desktop environment to use.  Can include several comma separated values.
 # Valid values are currently kde, gnome, lxde
-DESKTOP="kde"
+DESKTOP="${DESKTOP:-kde}"
 
 # LANG is the locale to use (should be configured using
 # dpkg-reconfigure locales), and LANGUAGE is the ordered set of
@@ -30,9 +35,13 @@
 # LANG="nb_NO.UTF-8"
 # LANGUAGE="nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en"
 
+# The Debian Edu suite to use to fetch the Debian Edu packages
+EDUSUITE="${EDUSUITE:-wheezy-test}"
+
 # Use american english if no language is set in the host system
 if [ -z "$LANG" ] ; then
     LANG="en_US.UTF-8"
+    export LANG
 fi
 
 # Any version string will do.  If an old and official version string
@@ -44,8 +53,10 @@
 # the test version of the APT repositories.
 TESTINSTALL="true"
 
-# Make sure the locale settings are visible
-export LANG LANGUAGE
+if [ 0 -ne $(id -u) ] ; then
+    echo "error: this script need to run as root."
+    exit 1
+fi
 
 setup_tasksel_overrides() {
     # Modify tasksels desktop test so the normal Debian desktop
@@ -91,8 +102,8 @@
 # 1. Add skolelinux related APT sources.
 apt-get install -y debian-edu-archive-keyring
 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
+deb http://ftp.skolelinux.org/skolelinux $EDUSUITE local
+deb-src http://ftp.skolelinux.org/skolelinux $EDUSUITE local
 EOF
 apt-get update