[25322] in Source-Commits
/svn/athena r24901 - trunk/debathena/scripts/installer/pxe/lucid/debathena
daemon@ATHENA.MIT.EDU (andrew m. boardman)
Wed Oct 20 11:14:02 2010
Date: Wed, 20 Oct 2010 11:13:56 -0400
From: "andrew m. boardman" <amb@MIT.EDU>
Message-Id: <201010201513.o9KFDuL2031938@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: amb
Date: 2010-10-20 11:13:56 -0400 (Wed, 20 Oct 2010)
New Revision: 24901
Modified:
trunk/debathena/scripts/installer/pxe/lucid/debathena/installer.sh
Log:
Don't reconfirm network settings for cluster installs. (They also
shouldn't be reconfirmed for other installs once they've been manually
confirmed, but that's harder.)
Modified: trunk/debathena/scripts/installer/pxe/lucid/debathena/installer.sh
===================================================================
--- trunk/debathena/scripts/installer/pxe/lucid/debathena/installer.sh 2010-10-19 19:23:07 UTC (rev 24900)
+++ trunk/debathena/scripts/installer/pxe/lucid/debathena/installer.sh 2010-10-20 15:13:56 UTC (rev 24901)
@@ -8,7 +8,7 @@
# Using debconf here will hang, so parse the command line manually.
# old options:
-# debathena/clusterforce: implies pxetype=cluster
+# debathena/clusterforce: implies pxetype=cluster, don't recheck net
# debathena/clusteraddr: address to use with above
# new options:
# debathena/pxetype: could be cluster, but could be other things
@@ -41,7 +41,7 @@
echo " Broadcast: $bc"
echo " Gateway: $GATEWAY"
- if [ "$clusterforce" != yes ] ; then
+ if [ "$pxetype" != cluster ] ; then
echo -n "Are these OK? [Y/n]: "; read response
case $response in
y|Y|"") ;;
@@ -242,7 +242,7 @@
echo "$pxetype" > $mp/pxe-install-flag
echo "Initial Debathena installer complete; exiting preconfig to start main install."
-if ! [ "$clusteraddr" -a "$clusterforce" = yes ] ; then
+if ! [ "$clusteraddr" -a "$pxetype" = cluster ] ; then
echo "Hit return to continue."
read r
fi
