[25816] in Source-Commits
/svn/athena r25246 - trunk/debathena/scripts/installer/pxe/natty/debathena
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Sat Jul 16 17:52:15 2011
Date: Sat, 16 Jul 2011 17:52:09 -0400
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <201107162152.p6GLq9sT006590@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2011-07-16 17:52:09 -0400 (Sat, 16 Jul 2011)
New Revision: 25246
Modified:
trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh
Log:
installer: install-debathena always needs our IP address in the preseed
Modified: trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh
===================================================================
--- trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh 2011-07-16 21:10:22 UTC (rev 25245)
+++ trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh 2011-07-16 21:52:09 UTC (rev 25246)
@@ -82,14 +82,6 @@
echo "nameserver 18.70.0.160" >> /etc/resolv.conf.new
echo "nameserver 18.71.0.151" >> /etc/resolv.conf.new
mv -f /etc/resolv.conf.new /etc/resolv.conf
- echo "Saving preseed netcfg values"
- cat >> preseed <<EOF
-d-i netcfg/get_nameservers string 18.72.0.3
-d-i netcfg/get_ipaddress string $IPADDR
-d-i netcfg/get_netmask string $NETMASK
-d-i netcfg/get_gateway string $GATEWAY
-d-i netcfg/confirm_static boolean true
-EOF
}
# Color strings. I'd like to use tput, but the installer doesn't have it.
@@ -110,6 +102,14 @@
if [ -n "$clusteraddr" ] && [ "$nodhcp" != "true" ]; then
IPADDR=$clusteraddr
netconfig
+ echo "Saving preseed netcfg values"
+ cat >> preseed <<EOF
+d-i netcfg/get_nameservers string 18.72.0.3
+d-i netcfg/get_ipaddress string $IPADDR
+d-i netcfg/get_netmask string $NETMASK
+d-i netcfg/get_gateway string $GATEWAY
+d-i netcfg/confirm_static boolean true
+EOF
fi
# We're at a point in the install process where we can be fairly sure
