[26416] in Source-Commits
/svn/athena r25555 - trunk/debathena/scripts/installer/pxe/stage1/debathena
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Sun Jun 3 16:00:24 2012
Date: Sun, 3 Jun 2012 16:00:22 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201206032000.q53K0MNU021393@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-06-03 16:00:22 -0400 (Sun, 03 Jun 2012)
New Revision: 25555
Modified:
trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh
Log:
Use variables we actually set in case statements; add missing ;;
Modified: trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh
===================================================================
--- trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh 2012-06-03 19:19:35 UTC (rev 25554)
+++ trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh 2012-06-03 20:00:22 UTC (rev 25555)
@@ -350,11 +350,12 @@
dkargs="DEBCONF_DEBUG=5"
nodhcp="netcfg/disable_dhcp=true"
-case "$UBUNTU_RELEASE" in
+case "$distro" in
oneiric|precise)
kbdcode="keyboard-configuration/layoutcode=us"
# "Yay"
nodhcp="netcfg/disable_autoconfig=true"
+ ;;
natty)
# Sigh
kbdcode="keyboard-configuration/layoutcode=us"
