[25930] in Source-Commits
/svn/athena r25314 - trunk/debathena/scripts/installer/pxe/stage1/debathena
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu Jul 28 13:48:52 2011
Date: Thu, 28 Jul 2011 13:48:46 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201107281748.p6SHmkSj022814@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-07-28 13:48:46 -0400 (Thu, 28 Jul 2011)
New Revision: 25314
Removed:
trunk/debathena/scripts/installer/pxe/stage1/debathena/sendlog
Modified:
trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh
Log:
* Remove 'sendlog' hack
* Log to syslog and inform the user about httpd
Modified: trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh
===================================================================
--- trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh 2011-07-28 14:45:35 UTC (rev 25313)
+++ trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh 2011-07-28 17:48:46 UTC (rev 25314)
@@ -14,7 +14,7 @@
debug () {
if [ "$test" != "test" ]; then
- echo "$@" > /debathena/debug.log
+ logger -t install.debug "$@"
else
echo "DEBUG: $@"
fi
@@ -367,9 +367,11 @@
debug "About to run kexec with these args: $dkargs $kargs"
./kexec -l linux --append="$dkargs $kargs" --initrd=initrd.gz \
&& sleep 3 && chvt 1 && sleep 2 && ./kexec -e
+curaddr="$(ip address show eth0 | grep inet | sed -e 's/^[ ]*inet //' | cut -d/ -f 1)"
echo "Secondary installed failed; please contact release-team@mit.edu"
-echo "with the circumstances of your install attempt. Here's a shell for debugging:"
-echo "(You might try running this command: /debathena/sendlog )"
+echo "with the circumstances of your install attempt. Here's a shell for debugging."
+echo "You can type 'httpd' to start an HTTP server which will make"
+echo "the system log available if you connect to http://$curaddr"
# We don't want to let this fall through to an actual install of whatever
# kernel we're using.
while : ; do /bin/sh ; done
