[26003] in Source-Commits

home help back first fref pref prev next nref lref last post

Re: /svn/athena r25337 - trunk/debathena/scripts/installer

daemon@ATHENA.MIT.EDU (Jonathan Reed)
Mon Aug 1 08:47:59 2011

Mime-Version: 1.0 (Apple Message framework v1084)
Content-Type: text/plain; charset=us-ascii
From: Jonathan Reed <jdreed@MIT.EDU>
In-Reply-To: <201108010507.p7157eIt028165@drugstore.mit.edu>
Date: Mon, 1 Aug 2011 08:47:52 -0400
Cc: source-commits@mit.edu
Message-Id: <784B408D-1EC7-4650-8E6E-FB859AC40FA4@mit.edu>
To: Geoffrey Thomas <geofft@mit.edu>
Content-Transfer-Encoding: 8bit

ACK, though I'm curious what happens if you pass "acpi=on" and "acpi=off" on the same cmdline.  Or if you pass "acpi=off" twice.  

-Jon

On Aug 1, 2011, at 1:07 AM, Geoffrey Thomas wrote:

> 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
> 
> 



home help back first fref pref prev next nref lref last post