[25798] in Source-Commits
/svn/athena r25236 - in trunk/debathena/scripts/installer: . pxe/natty/debathena
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu Jul 14 18:05:23 2011
Date: Thu, 14 Jul 2011 18:05:17 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201107142205.p6EM5HVW030200@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:05:17 -0400 (Thu, 14 Jul 2011)
New Revision: 25236
Modified:
trunk/debathena/scripts/installer/install-debathena.beta.sh
trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh
Log:
hescluster != hesclusters
Modified: trunk/debathena/scripts/installer/install-debathena.beta.sh
===================================================================
--- trunk/debathena/scripts/installer/install-debathena.beta.sh 2011-07-14 20:21:48 UTC (rev 25235)
+++ trunk/debathena/scripts/installer/install-debathena.beta.sh 2011-07-14 22:05:17 UTC (rev 25236)
@@ -262,7 +262,7 @@
aptexplained=false
for hc in proposed development bleeding; do
- if echo " $hesclusters " | grep -q " $hc "; then
+ if echo " $hescluster " | grep -q " $hc "; then
echo "Adding $distro-$hc apt repository."
if [ "${aptexplained}" = false ] ; then
echo "" >> $clustersourceslist
Modified: trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh
===================================================================
--- trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh 2011-07-14 20:21:48 UTC (rev 25235)
+++ trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh 2011-07-14 22:05:17 UTC (rev 25236)
@@ -90,7 +90,6 @@
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.
@@ -108,6 +107,9 @@
# 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
@@ -184,8 +186,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
