[26532] in Source-Commits
Re: /svn/athena r25605 - trunk/debathena/config/reactivate/debian
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Tue Jul 3 20:08:46 2012
Date: Tue, 3 Jul 2012 20:08:42 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201207021554.q62FsUch012439@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1207032008400.18441@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
ACK.
-Ben
On Mon, 2 Jul 2012, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2012-07-02 11:54:30 -0400 (Mon, 02 Jul 2012)
> New Revision: 25605
>
> Modified:
> trunk/debathena/config/reactivate/debian/01debathena-reactivate-cleanup
> trunk/debathena/config/reactivate/debian/99debathena-reactivate-setup
> trunk/debathena/config/reactivate/debian/changelog
> trunk/debathena/config/reactivate/debian/debathena-reactivate.install
> trunk/debathena/config/reactivate/debian/reactivate
> Log:
> In reactivate:
> * Use new lightdm-config hooks to actually run session setup and cleanup
>
>
> Modified: trunk/debathena/config/reactivate/debian/01debathena-reactivate-cleanup
> ===================================================================
> --- trunk/debathena/config/reactivate/debian/01debathena-reactivate-cleanup 2012-07-02 15:41:20 UTC (rev 25604)
> +++ trunk/debathena/config/reactivate/debian/01debathena-reactivate-cleanup 2012-07-02 15:54:30 UTC (rev 25605)
> @@ -1,6 +1,8 @@
> # This script is sourced (not executed) as root at the end of a gdm
> # login session. gdm blocks until it finishes. DISPLAY is set but
> # the X server might be dead in some cases.
> +# This script is also sourced as root at the end of a lightdm login
> +# session
>
> # Set the volume to zero for all sound cards, and save that state.
> invoke-rc.d debathena-reactivate start
>
> Modified: trunk/debathena/config/reactivate/debian/99debathena-reactivate-setup
> ===================================================================
> --- trunk/debathena/config/reactivate/debian/99debathena-reactivate-setup 2012-07-02 15:41:20 UTC (rev 25604)
> +++ trunk/debathena/config/reactivate/debian/99debathena-reactivate-setup 2012-07-02 15:54:30 UTC (rev 25605)
> @@ -1,5 +1,7 @@
> # This script is sourced (not executed) as root at the beginning of a
> # gdm login session. gdm blocks until it finishes.
> +# This script is also sourced as root at the end of a lightdm login
> +# session
>
> # Stop daemons that need to be restarted inside the chroot
> daemons=$(/usr/sbin/policy-rc.d --daemons)
>
> Modified: trunk/debathena/config/reactivate/debian/changelog
> ===================================================================
> --- trunk/debathena/config/reactivate/debian/changelog 2012-07-02 15:41:20 UTC (rev 25604)
> +++ trunk/debathena/config/reactivate/debian/changelog 2012-07-02 15:54:30 UTC (rev 25605)
> @@ -2,8 +2,9 @@
>
> * Update debian/copyright for 3-clause BSD and one GPL'd file
> * Ship 16killprocs-no-really to end sessions faster (Trac: #775)
> + * Use new lightdm-config hooks to actually run session setup and cleanup
>
> - -- Jonathan Reed <jdreed@mit.edu> Fri, 29 Jun 2012 12:48:18 -0400
> + -- Jonathan Reed <jdreed@mit.edu> Mon, 02 Jul 2012 10:59:02 -0400
>
> debathena-reactivate (2.0.34) unstable; urgency=low
>
>
> Modified: trunk/debathena/config/reactivate/debian/debathena-reactivate.install
> ===================================================================
> --- trunk/debathena/config/reactivate/debian/debathena-reactivate.install 2012-07-02 15:41:20 UTC (rev 25604)
> +++ trunk/debathena/config/reactivate/debian/debathena-reactivate.install 2012-07-02 15:54:30 UTC (rev 25605)
> @@ -2,6 +2,8 @@
> debian/lightdm-session.debathena usr/sbin
> debian/99debathena-reactivate-setup usr/share/debathena-gdm-config/PreSession.d
> debian/01debathena-reactivate-cleanup usr/share/debathena-gdm-config/PostSession.d
> +debian/99debathena-reactivate-setup usr/share/debathena-lightdm-config/session-setup.d
> +debian/01debathena-reactivate-cleanup usr/share/debathena-lightdm-config/session-cleanup.d
> debian/updatedb.findutils.cron.local etc
> debian/policy-rc.d usr/sbin
> debian/sudo-error etc/athena
>
> Modified: trunk/debathena/config/reactivate/debian/reactivate
> ===================================================================
> --- trunk/debathena/config/reactivate/debian/reactivate 2012-07-02 15:41:20 UTC (rev 25604)
> +++ trunk/debathena/config/reactivate/debian/reactivate 2012-07-02 15:54:30 UTC (rev 25605)
> @@ -11,7 +11,7 @@
> echo "BEGIN PRINT_PROCESS_INFO"
> pstree -alcnpu
> ps eauxwww
> - schroot --list
> + schroot --list -a
> LC_ALL=C lsof -b +c 0 -w
> echo "END PRINT_PROCESS_INFO"
> }
> @@ -54,5 +54,6 @@
> # perfectly good time to do so -- auto-update is inhibited during a
> # login session.
> if [ -e /var/run/reboot-required ]; then
> + echo "Reboot initiated at $(date)"
> reboot
> fi
>
>