[25797] in Source-Commits
Re: /svn/athena r25234 -
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Thu Jul 14 16:30:42 2011
Date: Thu, 14 Jul 2011 16:30:35 -0400 (EDT)
From: Geoffrey Thomas <geofft@MIT.EDU>
To: Jonathan D Reed <jdreed@mit.edu>
cc: source-commits@mit.edu
In-Reply-To: <201107141932.p6EJWHTD023448@drugstore.mit.edu>
Message-ID: <alpine.DEB.2.00.1107141627470.31835@tyger.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
ACK.
(I was thinking recovery-mode-config, but you're right,
cluster-login-config is actually more right here, since there are cases
where this can happen other than recovery mode.)
--
Geoffrey Thomas
geofft@mit.edu
On Thu, 14 Jul 2011, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2011-07-14 15:32:17 -0400 (Thu, 14 Jul 2011)
> New Revision: 25234
>
> Added:
> trunk/debathena/config/cluster-login-config/debian/50_debathena-cluster
> Modified:
> trunk/debathena/config/cluster-login-config/debian/changelog
> trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.install
> Log:
> In cluster-login-config:
> * Ship our own grub config to clobber the timeout value
>
>
> Added: trunk/debathena/config/cluster-login-config/debian/50_debathena-cluster
> ===================================================================
> --- trunk/debathena/config/cluster-login-config/debian/50_debathena-cluster (rev 0)
> +++ trunk/debathena/config/cluster-login-config/debian/50_debathena-cluster 2011-07-14 19:32:17 UTC (rev 25234)
> @@ -0,0 +1,10 @@
> +#!/bin/sh
> +
> +# Added by debathena-cluster-login-config to ensure machines
> +# don't sit at a grub prompt forever
> +
> +cat <<EOF
> +if [ \${timeout} = -1 ]; then
> + set timeout=60
> +fi
> +EOF
>
>
> Property changes on: trunk/debathena/config/cluster-login-config/debian/50_debathena-cluster
> ___________________________________________________________________
> Added: svn:executable
> + *
>
> Modified: trunk/debathena/config/cluster-login-config/debian/changelog
> ===================================================================
> --- trunk/debathena/config/cluster-login-config/debian/changelog 2011-07-13 14:52:17 UTC (rev 25233)
> +++ trunk/debathena/config/cluster-login-config/debian/changelog 2011-07-14 19:32:17 UTC (rev 25234)
> @@ -1,3 +1,9 @@
> +debathena-cluster-login-config (1.34) unstable; urgency=low
> +
> + * Ship our own grub config to clobber the timeout value
> +
> + -- Jonathan Reed <jdreed@mit.edu> Thu, 14 Jul 2011 15:22:01 -0400
> +
> debathena-cluster-login-config (1.33) unstable; urgency=low
>
> * Change display sleep time to 10 minutes (Trac: #894)
>
> Modified: trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.install
> ===================================================================
> --- trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.install 2011-07-13 14:52:17 UTC (rev 25233)
> +++ trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.install 2011-07-14 19:32:17 UTC (rev 25234)
> @@ -6,3 +6,4 @@
> debian/debathena-libstdcplusplus.pref etc/apt/preferences.d
> debian/disable-suspend.pkla etc/polkit-1/localauthority/30-site.d
> debian/disable-hibernate.pkla etc/polkit-1/localauthority/30-site.d
> +debian/50_debathena-cluster etc/grub.d
>
>
