[25832] in Source-Commits
/svn/athena r25253 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Jul 18 13:18:39 2011
Date: Mon, 18 Jul 2011 13:18:32 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201107181718.p6IHIWU5010115@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-07-18 13:18:32 -0400 (Mon, 18 Jul 2011)
New Revision: 25253
Modified:
trunk/debathena/config/auto-update/debian/athena-auto-upgrade
trunk/debathena/config/auto-update/debian/changelog
Log:
In auto-update:
* Don't kexec -e, instead reboot and rely on the init script
Modified: trunk/debathena/config/auto-update/debian/athena-auto-upgrade
===================================================================
--- trunk/debathena/config/auto-update/debian/athena-auto-upgrade 2011-07-18 16:32:47 UTC (rev 25252)
+++ trunk/debathena/config/auto-update/debian/athena-auto-upgrade 2011-07-18 17:18:32 UTC (rev 25253)
@@ -151,7 +151,13 @@
if [ $DEBUG -eq 1 ]; then
exit 0
fi
-/sbin/kexec -l linux --append="$dkargs $kargs" --initrd=initrd.gz \
- && sleep 3 && chvt 1 && sleep 2 && /sbin/kexec -e
-complain "Failed to kexec."
-exit 1
+# Don't kexec -e here, because modern Ubuntu is unable to kexec while
+# X is running. Instead, kexec -l and let the init script take care of.
+# Until Oneiric, when this will probably stop working if kexec-tools hasn't
+# been Upstartified.
+/sbin/kexec -l linux --append="$dkargs $kargs" --initrd=initrd.gz
+if [ "`cat /sys/kernel/kexec_loaded`" != "1" ]; then
+ echo "Hrm, looks like kexec -l didn't work. This upgrade might fail."
+fi
+reboot
+exit 0
Modified: trunk/debathena/config/auto-update/debian/changelog
===================================================================
--- trunk/debathena/config/auto-update/debian/changelog 2011-07-18 16:32:47 UTC (rev 25252)
+++ trunk/debathena/config/auto-update/debian/changelog 2011-07-18 17:18:32 UTC (rev 25253)
@@ -1,10 +1,11 @@
-debathena-auto-update (1.23.4) UNRELEASED; urgency=low
+debathena-auto-update (1.23.4) unstable; urgency=low
* Support Natty's idea of preseeding the keyboard layout
* Pass networking info straight to stage 2
+ * Don't kexec -e, instead reboot and rely on the init script
+
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 18 Jul 2011 13:18:01 -0400
- -- Jonathan Reed <jdreed@mit.edu> Tue, 12 Jul 2011 22:02:01 -0400
-
debathena-auto-update (1.23.3) unstable; urgency=low
* Log when running update hook
