[debian-edu-commits] r81291 - in branches/wheezy/debian-edu-config: debian sbin

[pere at alioth.debian.org]

Author: pere
Date: 2013-07-02 08:11:26 +0000 (Tue, 02 Jul 2013)
New Revision: 81291

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall
Log:
* Update debian-edu-pxeinstall to use the new keymap boot option to
  set the default keymap.  This changed between Squeeze and Wheezy.
* Make debian-edu-pxeinstall more robust, make sure it find the
  desktop preseeding also when doing PXE installations of the main
  server.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-07-02 08:02:25 UTC (rev 81290)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-07-02 08:11:26 UTC (rev 81291)
@@ -1,3 +1,14 @@
+debian-edu-config (1.708~svn81288) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Update debian-edu-pxeinstall to use the new keymap boot option to
+    set the default keymap.  This changed between Squeeze and Wheezy.
+  * Make debian-edu-pxeinstall more robust, make sure it find the
+    desktop preseeding also when doing PXE installations of the main
+    server.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Tue, 02 Jul 2013 10:10:01 +0200
+
 debian-edu-config (1.708~svn81287) wheezy-test; urgency=low
 
   [ Wolfgang Schweer ]

Modified: branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall
===================================================================
--- branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall	2013-07-02 08:02:25 UTC (rev 81290)
+++ branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall	2013-07-02 08:11:26 UTC (rev 81291)
@@ -90,14 +90,25 @@
 # does not work).  A workaround for this issue was added to
 # debian-edu-install, copying the files a bit earlier.
 installconfig=""
-for template in debian-installer/locale console-keymaps-at/keymap \
+for template in debian-installer/locale \
+    keyboard-configuration/xkb-keymap \
     tasksel/desktop; do
     value="$(debconf-get-selections --installer | grep $template | awk '{print $4}')"
+    if [ -z "$value" ] ; then
+	# If there is no value in the installer debconf database, try
+	# the currently installed one.  This solve a problem with
+	# tasksel/desktop when installing gnome via PXE.
+	value="$(debconf-get-selections | grep $template | awk '{print $4}')"
+    fi
 
     # Using desktop= as kernel argument work, while tasksel/desktop=
     # do not.  No idea why, but lets use the one that work.
     if [ "tasksel/desktop" = $template ] ; then template=desktop ; desktop=$value; fi
 
+    # Map the long name to the short alias, to keep the argument list
+    # shorter.
+    if [ "keyboard-configuration/xkb-keymap" = $template ] ; then template=keymap; fi
+
     if [ "$value" ] ; then
 	installconfig="$installconfig $template=$value"
     fi