[26315] in Source-Commits
/svn/athena r25515 - trunk/debathena/scripts/installer/pxe/stage1/debathena
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu May 17 13:26:45 2012
Date: Thu, 17 May 2012 13:26:43 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201205171726.q4HHQhsJ021431@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-05-17 13:26:43 -0400 (Thu, 17 May 2012)
New Revision: 25515
Modified:
trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh
Log:
Oneiric and up changed the parameter to disable DHCP
Modified: trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh
===================================================================
--- trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh 2012-05-17 15:41:18 UTC (rev 25514)
+++ trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh 2012-05-17 17:26:43 UTC (rev 25515)
@@ -336,13 +336,28 @@
fi
dkargs="DEBCONF_DEBUG=5"
+nodhcp="netcfg/disable_dhcp=true"
+case "$UBUNTU_RELEASE" in
+ oneiric|precise)
+ kbdcode="keyboard-configuration/layoutcode=us"
+ # "Yay"
+ nodhcp="netcfg/disable_autoconfig=true"
+ natty)
+ # Sigh
+ kbdcode="keyboard-configuration/layoutcode=us"
+ ;;
+ *)
+ kbdcode="console-setup/layoutcode=us"
+ ;;
+esac
+
hname="$HOSTNAME"
if [ "$IPADDR" = dhcp ] ; then
knetinfo="netcfg/get_hostname=$hname "
else
# There's no good way to get a hostname here, but the postinstall will deal.
# True, but thanks to wget, there's a bad way to get a hostname
- knetinfo="netcfg/disable_dhcp=true \
+ knetinfo="$nodhcp \
netcfg/get_domain=mit.edu \
netcfg/get_hostname=$hname \
netcfg/get_nameservers=18.72.0.3 \
@@ -352,17 +367,6 @@
netcfg/confirm_static=true"
fi
-case "$distro" in
- natty|oneiric)
- # Sigh
- kbdcode="keyboard-configuration/layoutcode=us"
- ;;
- *)
- kbdcode="console-setup/layoutcode=us"
- ;;
-esac
-
-
# SIGH See LP #818933
# This is fixed in Oneiric's kernel, but the PXE server is still serving
# natty (and will continue to do so until we have hardware that fails)
