[25320] in Source-Commits
/svn/athena r24899 - trunk/debathena/scripts/installer/pxe/lucid/debathena
daemon@ATHENA.MIT.EDU (andrew m. boardman)
Tue Oct 19 12:46:47 2010
Date: Tue, 19 Oct 2010 12:46:40 -0400
From: "andrew m. boardman" <amb@MIT.EDU>
Message-Id: <201010191646.o9JGkeYv024011@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: amb
Date: 2010-10-19 12:46:40 -0400 (Tue, 19 Oct 2010)
New Revision: 24899
Modified:
trunk/debathena/scripts/installer/pxe/lucid/debathena/installer.sh
Log:
Add debathena/pxetype as a config option for non-cluster installs
via kexec.
Modified: trunk/debathena/scripts/installer/pxe/lucid/debathena/installer.sh
===================================================================
--- trunk/debathena/scripts/installer/pxe/lucid/debathena/installer.sh 2010-10-19 16:12:06 UTC (rev 24898)
+++ trunk/debathena/scripts/installer/pxe/lucid/debathena/installer.sh 2010-10-19 16:46:40 UTC (rev 24899)
@@ -7,13 +7,19 @@
pxetype=""
# Using debconf here will hang, so parse the command line manually.
+# old options:
+# debathena/clusterforce: implies pxetype=cluster
+# debathena/clusteraddr: address to use with above
+# new options:
+# debathena/pxetype: could be cluster, but could be other things
+
clusterforce=`sed -e 's/ /\n/g' < /proc/cmdline | grep debathena/clusterforce | sed -e 's/.*=//'`
clusteraddr=`sed -e 's/ /\n/g' < /proc/cmdline | grep debathena/clusteraddr | sed -e 's/.*=//'`
+pxetype=`sed -e 's/ /\n/g' < /proc/cmdline | grep debathena/pxetype | sed -e 's/.*=//'`
if [ "$clusteraddr" ] ; then IPADDR=$clusteraddr ; fi
+if [ "$clusteraddr" -a "$clusterforce" = yes -a -z "$pxetype" ] ; then pxetype=cluster ; fi
-if [ "$clusteraddr" -a "$clusterforce" = yes ] ; then pxetype=cluster ; fi
-
netconfig () {
echo "Configuring network..."
mp=/debathena
