[25672] in Source-Commits
/svn/athena r25159 - trunk/debathena/scripts/installer/pxe/stage1/debathena
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Jun 22 22:47:17 2011
Date: Wed, 22 Jun 2011 22:47:10 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201106230247.p5N2lA2I032383@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-06-22 22:47:10 -0400 (Wed, 22 Jun 2011)
New Revision: 25159
Modified:
trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh
Log:
Of course Natty uses a different argument for the KB layout
Modified: trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh
===================================================================
--- trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh 2011-06-23 02:38:07 UTC (rev 25158)
+++ trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh 2011-06-23 02:47:10 UTC (rev 25159)
@@ -244,7 +244,17 @@
netcfg/confirm_static=true"
fi
-kargs="$knetinfo locale=en_US console-setup/layoutcode=us interface=auto \
+case "$distro" in
+ natty)
+ # Sigh
+ kbdcode="keyboard-configuration/layoutcode=us"
+ ;;
+ *)
+ kbdcode="console-setup/layoutcode=us"
+ ;;
+esac
+
+kargs="$knetinfo $kbdcode locale=en_US interface=auto \
url=http://18.9.60.73/installer/$distro/debathena.preseed \
debathena/pxetype=$pxetype debathena/clusteraddr=$IPADDR \
debathena/i=$installertype debathena/m=$mirrorsite --"
