[26005] in Source-Commits
/svn/athena r25340 - in trunk/debathena/scripts/installer: . pxe/stage1/debathena
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Aug 1 13:28:48 2011
Date: Mon, 1 Aug 2011 13:28:42 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201108011728.p71HSgfW005336@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-08-01 13:28:42 -0400 (Mon, 01 Aug 2011)
New Revision: 25340
Modified:
trunk/debathena/scripts/installer/install-debathena.beta.sh
trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh
Log:
Don't disable acpi, instead pass reboot=pci because why not
Modified: trunk/debathena/scripts/installer/install-debathena.beta.sh
===================================================================
--- trunk/debathena/scripts/installer/install-debathena.beta.sh 2011-08-01 12:52:58 UTC (rev 25339)
+++ trunk/debathena/scripts/installer/install-debathena.beta.sh 2011-08-01 17:28:42 UTC (rev 25340)
@@ -108,7 +108,7 @@
if [ "$category" != "cluster" ]; then
echo
echo "The Dell 790 sometimes has problems rebooting. The best way to"
- echo "workaround this is to disable ACPI at boot time."
+ echo "workaround this is to pass a 'reboot=pci' at boot time."
ask "Is it ok to do this now? [Y/n] " y
if [ y != "$answer" ]; then
noacpi=n
@@ -118,7 +118,7 @@
cat >> /etc/default/grub << 'EOF'
# Added by install-debathena.sh to address reboot issues on the Dell 790
-GRUB_CMDLINE_LINUX="acpi=off $GRUB_CMDLINE_LINUX"
+GRUB_CMDLINE_LINUX="reboot=pci $GRUB_CMDLINE_LINUX"
EOF
update-grub
fi
Modified: trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh
===================================================================
--- trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh 2011-08-01 12:52:58 UTC (rev 25339)
+++ trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh 2011-08-01 17:28:42 UTC (rev 25340)
@@ -358,7 +358,7 @@
# SIGH
acpi=""
if [ "$(cat /sys/class/dmi/id/product_name)" = "OptiPlex 790" ]; then
- acpi="acpi=off"
+ acpi="reboot=pci"
fi
kargs="$knetinfo $kbdcode $acpi locale=en_US interface=auto \
