[26019] in Source-Commits
/svn/athena r25349 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Aug 2 23:36:21 2011
Date: Tue, 2 Aug 2011 23:36:15 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201108030336.p733aFN7006371@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-08-02 23:36:15 -0400 (Tue, 02 Aug 2011)
New Revision: 25349
Modified:
trunk/debathena/config/auto-update/debian/athena-auto-upgrade
trunk/debathena/config/auto-update/debian/changelog
Log:
In auto-update:
* Always wave dead chickens
Modified: trunk/debathena/config/auto-update/debian/athena-auto-upgrade
===================================================================
--- trunk/debathena/config/auto-update/debian/athena-auto-upgrade 2011-08-02 22:20:58 UTC (rev 25348)
+++ trunk/debathena/config/auto-update/debian/athena-auto-upgrade 2011-08-03 03:36:15 UTC (rev 25349)
@@ -178,15 +178,6 @@
# Yes, really. The actual value of product_name on the Vostro is:
# "Vostro 320 "
case "$product_name" in
- "Vostro 320")
- # This is not so much Vostro 320-specific as it is i915 specific
- # Known to be necessary on PCI ID 8086:2e32, rev 03
- debug "Waving dead chicken..."
- # Run the video card's POST to reset it
- vbetool post
- # Disable the framebuffer, falling back to VGA
- echo 0 > /sys/class/vtconsole/vtcon1/bind
- ;;
"OptiPlex 790")
debug "Adding 'reboot=pci' for Dell 790"
kargs="$kargs reboot=pci"
@@ -195,6 +186,14 @@
if [ $(echo $kargs | wc -c) -ge 512 ]; then
complain "kargs exceeds 512 bytes. That's not good."
fi
+# This is not so much Vostro 320-specific as it is i915 specific
+# Known to be necessary on PCI ID 8086:2e32, rev 03
+# Actually, on all hardware, because Dell sucks. Or possibly Ubuntu.
+debug "Waving dead chicken..."
+# Run the video card's POST to reset it
+vbetool post
+# Disable the framebuffer, falling back to VGA
+echo 0 > /sys/class/vtconsole/vtcon1/bind
# 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
Modified: trunk/debathena/config/auto-update/debian/changelog
===================================================================
--- trunk/debathena/config/auto-update/debian/changelog 2011-08-02 22:20:58 UTC (rev 25348)
+++ trunk/debathena/config/auto-update/debian/changelog 2011-08-03 03:36:15 UTC (rev 25349)
@@ -1,3 +1,9 @@
+debathena-auto-update (1.28) unstable; urgency=low
+
+ * Always wave dead chickens
+
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 02 Aug 2011 23:36:10 -0400
+
debathena-auto-update (1.27) unstable; urgency=low
[ Geoffrey Thomas ]
