[25998] in Source-Commits
/svn/athena r25337 - trunk/debathena/scripts/installer
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Mon Aug 1 01:07:47 2011
Date: Mon, 1 Aug 2011 01:07:40 -0400
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <201108010507.p7157eIt028165@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2011-08-01 01:07:40 -0400 (Mon, 01 Aug 2011)
New Revision: 25337
Modified:
trunk/debathena/scripts/installer/install-debathena.beta.sh
Log:
Bikeshed about acpi=off (this should be marginally more robust)
Modified: trunk/debathena/scripts/installer/install-debathena.beta.sh
===================================================================
--- trunk/debathena/scripts/installer/install-debathena.beta.sh 2011-07-31 21:38:15 UTC (rev 25336)
+++ trunk/debathena/scripts/installer/install-debathena.beta.sh 2011-08-01 05:07:40 UTC (rev 25337)
@@ -106,6 +106,7 @@
if [ "$(cat /sys/class/dmi/id/product_name)" = "OptiPlex 790" ]; then
noacpi=y
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."
ask "Is it ok to do this now? [Y/n] " y
@@ -114,9 +115,12 @@
fi
fi
if [ "$noacpi" = "y" ]; then
- if sed -i -e 's/^GRUB_CMDLINE_LINUX="/GRUB_CMDLINE_LINUX="acpi=off /' /etc/default/grub; then
- update-grub
- fi
+ 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"
+EOF
+ update-grub
fi
fi
