[26816] in Source-Commits
/svn/athena r25773 - in trunk/debathena: config/reactivate/debian debathena/xsession/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Sep 26 17:14:51 2012
Date: Wed, 26 Sep 2012 17:14:44 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201209262114.q8QLEi1u024867@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-09-26 17:14:44 -0400 (Wed, 26 Sep 2012)
New Revision: 25773
Modified:
trunk/debathena/config/reactivate/debian/changelog
trunk/debathena/config/reactivate/debian/debathena-reactivate.init
trunk/debathena/debathena/xsession/debian/changelog
trunk/debathena/debathena/xsession/debian/debathena-nocalls.sh
Log:
In reactivate:
* Cleanup cached user dmrc files and AccountService entries (Trac:
#1259)
In xsession:
* Cleanup lightdm's cached dmrc
Modified: trunk/debathena/config/reactivate/debian/changelog
===================================================================
--- trunk/debathena/config/reactivate/debian/changelog 2012-09-26 19:49:26 UTC (rev 25772)
+++ trunk/debathena/config/reactivate/debian/changelog 2012-09-26 21:14:44 UTC (rev 25773)
@@ -2,8 +2,10 @@
* Bump the chroot's ramdisk to 50% of RAM or 1G, whichever is higher
(Trac: #1207)
+ * Cleanup cached user dmrc files and AccountService entries (Trac:
+ #1259)
- -- Jonathan Reed <jdreed@mit.edu> Wed, 26 Sep 2012 15:49:05 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 26 Sep 2012 17:08:56 -0400
debathena-reactivate (2.0.40) unstable; urgency=low
Modified: trunk/debathena/config/reactivate/debian/debathena-reactivate.init
===================================================================
--- trunk/debathena/config/reactivate/debian/debathena-reactivate.init 2012-09-26 19:49:26 UTC (rev 25772)
+++ trunk/debathena/config/reactivate/debian/debathena-reactivate.init 2012-09-26 21:14:44 UTC (rev 25773)
@@ -18,6 +18,10 @@
start)
# Clean up the per-user files cached locally by gdm.
rm -rf /var/cache/gdm/*
+ # And lightdm's cached dmrc
+ rm -rf /var/cache/lightdm/dmrc/*
+ # And AccountsService's cached session info
+ rm -rf /var/lib/AccountsService/users/*
# Set the volume to zero for all sound cards, and save that state.
(/etc/init.d/alsa-utils stop all && alsactl store) > /dev/null 2>&1
Modified: trunk/debathena/debathena/xsession/debian/changelog
===================================================================
--- trunk/debathena/debathena/xsession/debian/changelog 2012-09-26 19:49:26 UTC (rev 25772)
+++ trunk/debathena/debathena/xsession/debian/changelog 2012-09-26 21:14:44 UTC (rev 25773)
@@ -1,8 +1,9 @@
-debathena-xsession (1.17.6) UNRELEASED; urgency=low
+debathena-xsession (1.18) unstable; urgency=low
* Bump debian/compat to 6
+ * Cleanup lightdm's cached dmrc
- -- Jonathan Reed <jdreed@mit.edu> Sun, 01 Jul 2012 12:21:40 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 26 Sep 2012 17:13:58 -0400
debathena-xsession (1.17.5) unstable; urgency=low
Modified: trunk/debathena/debathena/xsession/debian/debathena-nocalls.sh
===================================================================
--- trunk/debathena/debathena/xsession/debian/debathena-nocalls.sh 2012-09-26 19:49:26 UTC (rev 25772)
+++ trunk/debathena/debathena/xsession/debian/debathena-nocalls.sh 2012-09-26 21:14:44 UTC (rev 25773)
@@ -7,9 +7,12 @@
fi
# You don't actually want nocalls as your default session
-[ -e "$HOME/.dmrc" ] && \
- grep -q 000debathena-nocalls "$HOME/.dmrc" && \
- rm "$HOME/.dmrc"
-[ -e "/var/cache/gdm/$USER/dmrc" ] && \
- grep -q 000debathena-nocalls "/var/cache/gdm/$USER/dmrc" && \
- rm "/var/cache/gdm/$USER/dmrc"
+DMRCFILES="$HOME/.dmrc \
+ /var/cache/gdm/$USER/dmrc \
+ /var/cache/lightdm/dmrc/$USER.dmrc"
+
+for f in $DMRCFILES; do
+ [ -e "$f" ] && \
+ grep -q 000debathena-nocalls "$f" && \
+ rm "$f"
+done
