[25799] in Source-Commits
/svn/athena r25237 - trunk/debathena/scripts/installer/pxe/natty/debathena
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu Jul 14 18:06:14 2011
Date: Thu, 14 Jul 2011 18:06:08 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201107142206.p6EM68IG030481@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-07-14 18:06:08 -0400 (Thu, 14 Jul 2011)
New Revision: 25237
Modified:
trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh
Log:
Revert second-half of r25236
Modified: trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh
===================================================================
--- trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh 2011-07-14 22:05:17 UTC (rev 25236)
+++ trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh 2011-07-14 22:06:08 UTC (rev 25237)
@@ -90,6 +90,7 @@
d-i netcfg/get_gateway string $GATEWAY
d-i netcfg/confirm_static boolean true
EOF
+fi
}
# Color strings. I'd like to use tput, but the installer doesn't have it.
@@ -107,9 +108,6 @@
# so if we have a DHCP address here, it's either valid, or we got here
# from an old athena-auto-upgrade that doesn't do full networking.
-echo "Pausing..."
-read dummy
-
if [ -n "$clusteraddr" ] && [ "$nodhcp" != "true" ]; then
IPADDR=$clusteraddr
netconfig
@@ -186,8 +184,8 @@
echo "$pxetype" > $mp/pxe-install-flag
echo "Initial Debathena installer complete; exiting preconfig to start main install."
-#if [ "$pxetype" != cluster ] ; then
+if [ "$pxetype" != cluster ] ; then
echo "Hit return to continue."
read r
-#fi
+fi
exit 0
