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

[pere at alioth.debian.org]

Author: pere
Date: 2013-07-02 10:01:01 +0000 (Tue, 02 Jul 2013)
New Revision: 81295

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall
Log:
Teach debian-edu-pxeinstall to use short forms locale and keymap
as boot parameters to make the parameter list shorter.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-07-02 08:31:56 UTC (rev 81294)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-07-02 10:01:01 UTC (rev 81295)
@@ -6,6 +6,8 @@
   * Make debian-edu-pxeinstall more robust, make sure it find the
     desktop preseeding also when doing PXE installations of the main
     server.
+  * Teach debian-edu-pxeinstall to use short forms locale and keymap
+    as boot parameters to make the parameter list shorter.
 
  -- Petter Reinholdtsen <pere at debian.org>  Tue, 02 Jul 2013 10:10:01 +0200
 

Modified: branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall
===================================================================
--- branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall	2013-07-02 08:31:56 UTC (rev 81294)
+++ branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall	2013-07-02 10:01:01 UTC (rev 81295)
@@ -107,6 +107,7 @@
 
     # Map the long name to the short alias, to keep the argument list
     # shorter.
+    if [ "debian-installer/locale" = $template ] ; then template=locale; fi
     if [ "keyboard-configuration/xkb-keymap" = $template ] ; then template=keymap; fi
 
     if [ "$value" ] ; then