[24432] in Source-Commits
/svn/athena r24023 - trunk/debathena/config/reactivate/debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Mon Sep 28 14:49:43 2009
Date: Mon, 28 Sep 2009 14:49:29 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200909281849.n8SInTaG004792@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-09-28 14:49:29 -0400 (Mon, 28 Sep 2009)
New Revision: 24023
Added:
trunk/debathena/config/reactivate/debian/01debathena-reactivate-cleanup
trunk/debathena/config/reactivate/debian/99debathena-reactivate-setup
Removed:
trunk/debathena/config/reactivate/debian/PostSession/
trunk/debathena/config/reactivate/debian/PreSession/
Modified:
trunk/debathena/config/reactivate/debian/changelog
trunk/debathena/config/reactivate/debian/control.in
trunk/debathena/config/reactivate/debian/debathena-reactivate.install
trunk/debathena/config/reactivate/debian/rules
Log:
In reactivate:
* Use the new /etc/gdm/{Pre,Post}Session.d directories in gdm-config.
Copied: trunk/debathena/config/reactivate/debian/01debathena-reactivate-cleanup (from rev 24021, trunk/debathena/config/reactivate/debian/PostSession/Default.debathena)
===================================================================
--- trunk/debathena/config/reactivate/debian/PostSession/Default.debathena 2009-09-28 18:30:53 UTC (rev 24021)
+++ trunk/debathena/config/reactivate/debian/01debathena-reactivate-cleanup 2009-09-28 18:49:29 UTC (rev 24023)
@@ -0,0 +1,9 @@
+# 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.
+
+# Set the volume to zero for all sound cards, and save that state.
+invoke-rc.d debathena-reactivate start
+
+# Clean up the login snapshot.
+athena-login-snapshot login-end
Property changes on: trunk/debathena/config/reactivate/debian/01debathena-reactivate-cleanup
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Copied: trunk/debathena/config/reactivate/debian/99debathena-reactivate-setup (from rev 24021, trunk/debathena/config/reactivate/debian/PreSession/Default.debathena)
===================================================================
--- trunk/debathena/config/reactivate/debian/PreSession/Default.debathena 2009-09-28 18:30:53 UTC (rev 24021)
+++ trunk/debathena/config/reactivate/debian/99debathena-reactivate-setup 2009-09-28 18:49:29 UTC (rev 24023)
@@ -0,0 +1,5 @@
+# This script is sourced (not executed) as root at the beginning of a
+# gdm login session. gdm blocks until it finishes.
+
+# Create a login chroot for this login session.
+athena-login-snapshot login-start || exit
Property changes on: trunk/debathena/config/reactivate/debian/99debathena-reactivate-setup
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Modified: trunk/debathena/config/reactivate/debian/changelog
===================================================================
--- trunk/debathena/config/reactivate/debian/changelog 2009-09-28 18:49:23 UTC (rev 24022)
+++ trunk/debathena/config/reactivate/debian/changelog 2009-09-28 18:49:29 UTC (rev 24023)
@@ -1,3 +1,9 @@
+debathena-reactivate (1.22) unstable; urgency=low
+
+ * Use the new /etc/gdm/{Pre,Post}Session.d directories in gdm-config.
+
+ -- Evan Broder <broder@mit.edu> Mon, 28 Sep 2009 14:44:49 -0400
+
debathena-reactivate (1.21) unstable; urgency=low
* Avoid sound during first login (Trac: 292).
Modified: trunk/debathena/config/reactivate/debian/control.in
===================================================================
--- trunk/debathena/config/reactivate/debian/control.in 2009-09-28 18:49:23 UTC (rev 24022)
+++ trunk/debathena/config/reactivate/debian/control.in 2009-09-28 18:49:29 UTC (rev 24023)
@@ -7,7 +7,7 @@
Package: debathena-reactivate
Architecture: all
-Depends: schroot, lvm2, psmisc, gdm, alsa-utils, ${misc:Depends}
+Depends: schroot, lvm2, psmisc, gdm, alsa-utils, gdm-config (>= 1.14~), ${misc:Depends}
Provides: ${diverted-files}
Conflicts: ${diverted-files}
Description: Causes gdm logins to run in an ephemeral snapshot of the root
Modified: trunk/debathena/config/reactivate/debian/debathena-reactivate.install
===================================================================
--- trunk/debathena/config/reactivate/debian/debathena-reactivate.install 2009-09-28 18:49:23 UTC (rev 24022)
+++ trunk/debathena/config/reactivate/debian/debathena-reactivate.install 2009-09-28 18:49:29 UTC (rev 24023)
@@ -1,7 +1,7 @@
debian/athena-login-snapshot usr/sbin
debian/Xsession.debathena etc/gdm
-debian/PreSession/Default.debathena etc/gdm/PreSession
-debian/PostSession/Default.debathena etc/gdm/PostSession
+debian/99debathena-reactivate-setup etc/gdm/PreSession.d
+debian/01debathena-reactivate-cleanup etc/gdm/PostSession.d
debian/updatedb.findutils.cron.local etc
debian/policy-rc.d usr/sbin
debian/sudo-warning etc/athena
Modified: trunk/debathena/config/reactivate/debian/rules
===================================================================
--- trunk/debathena/config/reactivate/debian/rules 2009-09-28 18:49:23 UTC (rev 24022)
+++ trunk/debathena/config/reactivate/debian/rules 2009-09-28 18:49:29 UTC (rev 24023)
@@ -2,13 +2,18 @@
DEB_DIVERT_EXTENSION = .debathena
DEB_DIVERT_FILES_debathena-reactivate += \
- /etc/gdm/Xsession.debathena \
- /etc/gdm/PreSession/Default.debathena \
- /etc/gdm/PostSession/Default.debathena
+ /etc/gdm/Xsession.debathena
DEB_TRANSFORM_FILES_debathena-reactivate += \
/etc/pam.d/su.debathena
DEB_REMOVE_FILES_debathena-reactivate += \
/etc/xdg/autostart/jockey-gtk.desktop \
/etc/xdg/autostart/update-notifier.desktop
+
+DEB_UNDIVERT_FILES_debathena-reactivate += \
+ /etc/gdm/PreSession/Default.debathena \
+ /etc/gdm/PostSession/Default.debathena
+DEB_UNDIVERT_VERSION_/etc/gdm/PreSession/Default.debathena = 1.22
+DEB_UNDIVERT_VERSION_/etc/gdm/PostSession/Default.debathena = 1.22
+
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/config-package.mk
