[24275] in Source-Commits
/svn/athena r23873 - in trunk/debathena/scripts/installer/pxe/jaunty: . debathena-jaunty
daemon@ATHENA.MIT.EDU (andrew m. boardman)
Thu Jun 18 17:43:08 2009
Date: Thu, 18 Jun 2009 17:42:56 -0400
From: "andrew m. boardman" <amb@MIT.EDU>
Message-Id: <200906182142.n5ILguY3020985@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: amb
Date: 2009-06-18 17:42:56 -0400 (Thu, 18 Jun 2009)
New Revision: 23873
Modified:
trunk/debathena/scripts/installer/pxe/jaunty/Makefile
trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty.preseed
trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty/installer.sh
Log:
Clean up the jaunty install process a bit, and add support for kernel options to
shortcut install-time queries to make cluster reinstalls easier.
Modified: trunk/debathena/scripts/installer/pxe/jaunty/Makefile
===================================================================
--- trunk/debathena/scripts/installer/pxe/jaunty/Makefile 2009-06-18 06:57:53 UTC (rev 23872)
+++ trunk/debathena/scripts/installer/pxe/jaunty/Makefile 2009-06-18 21:42:56 UTC (rev 23873)
@@ -1,6 +1,11 @@
-# Don't look, don't use. Icky.
-d=/afs/dev/system/athena10/installer/intrepid
+# This is pretty dangerous in a bunch of ways. Approach with caution.
+d=/afs/dev/system/athena10/installer/jaunty
-${d}/athena10-intrepid.tar.gz: athena10-intrepid.preseed athena10-intrepid-loader.sh pxe.config athena10-intrepid
- tar czvf ${d}/athena10-intrepid.tar.gz --exclude "*~" athena10-intrepid
- cp athena10-intrepid.preseed athena10-intrepid-loader.sh ${d}
+default:
+ : Use "make install" to move this from where the installer will fetch it.
+
+install: ${d}/debathena-jaunty.tar.gz
+
+${d}/debathena-jaunty.tar.gz: debathena-jaunty.preseed debathena-jaunty-loader.sh debathena-jaunty
+ tar czvf ${d}/debathena-jaunty.tar.gz --exclude "*~" --exclude "*/.svn*" debathena-jaunty
+ cp debathena-jaunty.preseed debathena-jaunty-loader.sh ${d}
Modified: trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty/installer.sh
===================================================================
--- trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty/installer.sh 2009-06-18 06:57:53 UTC (rev 23872)
+++ trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty/installer.sh 2009-06-18 21:42:56 UTC (rev 23873)
@@ -6,6 +6,14 @@
pxetype=""
+# Using debconf here will hang, so parse the command line manually.
+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/.*=//'`
+
+if [ "$clusteraddr" ] ; then IPADDR=$clusteraddr ; fi
+
+if [ "$clusteraddr" -a "$clusterforce" = yes ] ; then pxetype=cluster ; fi
+
netconfig () {
echo "Configuring network..."
mp=/debathena-jaunty
@@ -20,18 +28,23 @@
GATEWAY=`$mp/athena/netparams -f $mp/athena/masks $IPADDR|cut -d\ -f 4`
maskbits=`$mp/athena/netparams -f $mp/athena/masks $IPADDR|cut -d\ -f 5`
+ echo "Address: $IPADDR"
+ echo
echo "Autoconfigured settings:"
echo " Netmask bits: $maskbits"
echo " Broadcast: $bc"
echo " Gateway: $GATEWAY"
- echo -n "Are these OK? [Y/n]: "; read response
- case $response in
- y|Y|"") ;;
- *)
- echo -n "Netmask bits [$maskbits]: "; read r; if [ "$r" ] ; then maskbits=$r ; fi
- echo -n "Broadcast [$bc]: "; read r; if [ "$r" ] ; then bc=$r ; fi
- echo -n "Gateway [$GATEWAY]: "; read r; if [ "$r" ] ; then GATEWAY=$r ; fi
+
+ if [ "$clusterforce" != yes ] ; then
+ echo -n "Are these OK? [Y/n]: "; read response
+ case $response in
+ y|Y|"") ;;
+ *)
+ echo -n "Netmask bits [$maskbits]: "; read r; if [ "$r" ] ; then maskbits=$r ; fi
+ echo -n "Broadcast [$bc]: "; read r; if [ "$r" ] ; then bc=$r ; fi
+ echo -n "Gateway [$GATEWAY]: "; read r; if [ "$r" ] ; then GATEWAY=$r ; fi
esac
+ fi
# We can not set the hostname here; running "debconf-set netcfg/get_hostname"
# causes fatal reentry problems. Setting values directly with preseeding
@@ -168,6 +181,8 @@
echo "$pxetype" > $mp/pxe-install-flag
echo "Initial Debathena installer complete; exiting preconfig to start main install."
-echo "Hit return to continue."
-read r
+if ! [ "$clusteraddr" -a "$clusterforce" = yes ] ; then
+ echo "Hit return to continue."
+ read r
+fi
exit 0
Modified: trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty.preseed
===================================================================
--- trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty.preseed 2009-06-18 06:57:53 UTC (rev 23872)
+++ trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty.preseed 2009-06-18 21:42:56 UTC (rev 23873)
@@ -1,4 +1,4 @@
# Minimal preseed, designed to just punt to our own network-based installer.
# 18.92.2.195 = athena10.mit.edu
# 18.9.60.73 = new athena10.mit.edu
-d-i preseed/include_command string wget -q http://18.9.60.73/installer/intrepid/debathena-jaunty-loader.sh ; sh debathena-jaunty-loader.sh
+d-i preseed/include_command string wget -q http://18.9.60.73/installer/jaunty/debathena-jaunty-loader.sh ; sh debathena-jaunty-loader.sh
