[26771] in Source-Commits
/svn/athena r25741 - trunk/debathena/config/cluster-login-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Aug 29 14:15:46 2012
Date: Wed, 29 Aug 2012 14:15:44 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201208291815.q7TIFiOV028525@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-08-29 14:15:44 -0400 (Wed, 29 Aug 2012)
New Revision: 25741
Added:
trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.gsettings-override
Modified:
trunk/debathena/config/cluster-login-config/debian/changelog
trunk/debathena/config/cluster-login-config/debian/screensaver_logout.sh
Log:
In cluster-login-config:
* Provide a gsettings-override file for Precise (Trac: #1242)
* Update screensaver-logout to use gnome-session-quit
Modified: trunk/debathena/config/cluster-login-config/debian/changelog
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/changelog 2012-08-29 14:15:39 UTC (rev 25740)
+++ trunk/debathena/config/cluster-login-config/debian/changelog 2012-08-29 18:15:44 UTC (rev 25741)
@@ -1,3 +1,10 @@
+debathena-cluster-login-config (1.37) unstable; urgency=low
+
+ * Provide a gsettings-override file for Precise (Trac: #1242)
+ * Update screensaver-logout to use gnome-session-quit
+
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 29 Aug 2012 14:15:30 -0400
+
debathena-cluster-login-config (1.36.3) unstable; urgency=low
* No change rebuild to pick up config-package-dev 4.13 changes
Added: trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.gsettings-override
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.gsettings-override (rev 0)
+++ trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.gsettings-override 2012-08-29 18:15:44 UTC (rev 25741)
@@ -0,0 +1,7 @@
+[org.gnome.desktop.screensaver]
+logout-enabled=true
+logout-delay=1200
+logout-command='/usr/share/debathena-cluster-login-config/screensaver_logout.sh'
+user-switch-enabled=false
+
+
Modified: trunk/debathena/config/cluster-login-config/debian/screensaver_logout.sh
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/screensaver_logout.sh 2012-08-29 14:15:39 UTC (rev 25740)
+++ trunk/debathena/config/cluster-login-config/debian/screensaver_logout.sh 2012-08-29 18:15:44 UTC (rev 25741)
@@ -5,8 +5,13 @@
PATH=/usr/bin:/bin:$PATH
+GSESSION_END="gnome-session-quit --logout --no-prompt"
+if ! hash gnome-session-quit 2>/dev/null; then
+ GSESSION_END="gnome-session-save --force-logout"
+fi
+
if [ "$(machtype -L)" != "debathena-cluster" ]; then
- gnome-session-save --force-logout
+ $GSESSION_END
exit 0
fi
@@ -20,7 +25,7 @@
cell=$(echo $afspath | cut -d/ -f 3)
fi
if tokens | fgrep -q $cell; then
- gnome-session-save --force-logout
+ $GSESSION_END
else
pkill schroot
fi
