[25846] in Source-Commits
Re: /svn/athena r25259 -
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Tue Jul 19 18:51:03 2011
Date: Tue, 19 Jul 2011 18:50:56 -0400 (EDT)
From: Geoffrey Thomas <geofft@MIT.EDU>
To: Jonathan D Reed <jdreed@mit.edu>
cc: source-commits@mit.edu
In-Reply-To: <201107192250.p6JMocQc022790@drugstore.mit.edu>
Message-ID: <alpine.DEB.2.00.1107191850550.9927@tyger.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
ACK
--
Geoffrey Thomas
geofft@mit.edu
On Tue, 19 Jul 2011, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2011-07-19 18:50:38 -0400 (Tue, 19 Jul 2011)
> New Revision: 25259
>
> Modified:
> trunk/debathena/config/cluster-login-config/debian/changelog
> trunk/debathena/config/cluster-login-config/debian/control.in
> trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst
> Log:
> In cluster-login-config:
> * Run update-grub (and depend grub, I guess)
>
>
> Modified: trunk/debathena/config/cluster-login-config/debian/changelog
> ===================================================================
> --- trunk/debathena/config/cluster-login-config/debian/changelog 2011-07-19 21:58:09 UTC (rev 25258)
> +++ trunk/debathena/config/cluster-login-config/debian/changelog 2011-07-19 22:50:38 UTC (rev 25259)
> @@ -1,3 +1,9 @@
> +debathena-cluster-login-config (1.35) unstable; urgency=low
> +
> + * Run update-grub (and depend grub, I guess)
> +
> + -- Jonathan Reed <jdreed@mit.edu> Tue, 19 Jul 2011 18:47:41 -0400
> +
> debathena-cluster-login-config (1.34) unstable; urgency=low
>
> * Ship our own grub config to clobber the timeout value
>
> Modified: trunk/debathena/config/cluster-login-config/debian/control.in
> ===================================================================
> --- trunk/debathena/config/cluster-login-config/debian/control.in 2011-07-19 21:58:09 UTC (rev 25258)
> +++ trunk/debathena/config/cluster-login-config/debian/control.in 2011-07-19 22:50:38 UTC (rev 25259)
> @@ -7,7 +7,7 @@
>
> Package: debathena-cluster-login-config
> Architecture: all
> -Depends: ${misc:Depends}, debathena-afs-config, debathena-gdm-config, debathena-kiosk, gconf2, gnome-screensaver, update-notifier-common, debathena-machtype (>= 10.0.2-0debathena1~), python-dbus
> +Depends: ${misc:Depends}, debathena-afs-config, debathena-gdm-config, debathena-kiosk, gconf2, gnome-screensaver, update-notifier-common, debathena-machtype (>= 10.0.2-0debathena1~), python-dbus, grub-common
> Provides: ${diverted-files}
> Conflicts: ${diverted-files}
> Breaks: debathena-reactivate (<< 2~)
>
> Modified: trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst
> ===================================================================
> --- trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst 2011-07-19 21:58:09 UTC (rev 25258)
> +++ trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst 2011-07-19 22:50:38 UTC (rev 25259)
> @@ -97,6 +97,10 @@
> fi
> fi
>
> + if dpkg --compare-versions "$1" lt 1.34~; then
> + update-grub
> + fi
> +
> # Shut down sshd and reload gdm.
> if hash invoke-rc.d; then
> invoke-rc.d ssh stop
>
>