[25465] in Source-Commits
/svn/athena r25002 - trunk/debathena/config/cluster-login-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri Mar 4 22:12:40 2011
Date: Fri, 4 Mar 2011 22:12:34 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201103050312.p253CYL9009392@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-03-04 22:12:34 -0500 (Fri, 04 Mar 2011)
New Revision: 25002
Added:
trunk/debathena/config/cluster-login-config/debian/screensaver_logout.sh
Modified:
trunk/debathena/config/cluster-login-config/debian/changelog
trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.install
trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst
Log:
In cluster-login-config:
* Ship our own logout command which will force a logout on cluster if
the user lacks tokens
Modified: trunk/debathena/config/cluster-login-config/debian/changelog
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/changelog 2011-03-03 01:18:31 UTC (rev 25001)
+++ trunk/debathena/config/cluster-login-config/debian/changelog 2011-03-05 03:12:34 UTC (rev 25002)
@@ -1,3 +1,10 @@
+debathena-cluster-login-config (1.30) unstable; urgency=low
+
+ * Ship our own logout command which will force a logout on cluster if
+ the user lacks tokens
+
+ -- Jonathan Reed <jdreed@mit.edu> Fri, 04 Mar 2011 22:12:29 -0500
+
debathena-cluster-login-config (1.29) unstable; urgency=low
* Transform the dbus gdm.conf to break user switching
Modified: trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.install
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.install 2011-03-03 01:18:31 UTC (rev 25001)
+++ trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.install 2011-03-05 03:12:34 UTC (rev 25002)
@@ -1,3 +1,4 @@
debian/athena-root-password usr/sbin
debian/sshd_not_to_be_run etc/ssh
debian/getty.debathena sbin
+debian/screensaver_logout.sh usr/share/debathena-cluster-login-config
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-03-03 01:18:31 UTC (rev 25001)
+++ trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst 2011-03-05 03:12:34 UTC (rev 25002)
@@ -123,7 +123,7 @@
$gc -t bool /apps/gnome-screensaver/logout_enabled true
$gc -t int /apps/gnome-screensaver/logout_delay 20
$gc -t string /apps/gnome-screensaver/logout_command \
- "/usr/bin/gnome-session-save --force-logout"
+ "/usr/share/debathena-cluster-login-config/screensaver_logout.sh"
# KLUDGE: gnome-screensaver can overwrite its internal
# logout_command setting with the embedded_keyboard_command
# value (http://bugzilla.gnome.org/show_bug.cgi?id=573495).
@@ -132,7 +132,7 @@
# has been fixed. Also disable the embedded_keyboard to ensure
# that this value is not used otherwise.
$gc -t string /apps/gnome-screensaver/embedded_keyboard_command \
- "/usr/bin/gnome-session-save --force-logout"
+ "/usr/share/debathena-cluster-login-config/screensaver_logout.sh"
$gc -t bool /apps/gnome-screensaver/embedded_keyboard_enabled false
$gc -t bool /apps/gnome-screensaver/user_switch_enabled false
$gc -t bool /apps/gnome-screensaver/lock_enabled true
Added: trunk/debathena/config/cluster-login-config/debian/screensaver_logout.sh
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/screensaver_logout.sh (rev 0)
+++ trunk/debathena/config/cluster-login-config/debian/screensaver_logout.sh 2011-03-05 03:12:34 UTC (rev 25002)
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# A more ... insistent ... logout command for gnome-screensaver
+#
+
+PATH=/usr/bin:/bin:$PATH
+
+if [ "$(machtype -L)" != "debathena-cluster" ]; then
+ gnome-session-save --force-logout
+ exit 0
+fi
+
+cell=athena.mit.edu
+afspath=$HOME
+if echo $HOME | grep -q ^/mit; then
+ # Shouldn't happen with std dotfiles
+ afspath=$(readlink $HOME)
+fi
+if echo $afspath | grep -q ^/afs; then
+ cell=$(echo $afspath | cut -d/ -f 3)
+fi
+if tokens | fgrep -q $cell; then
+ gnome-session-save --force-logout
+else
+ pkill schroot
+fi
+
Property changes on: trunk/debathena/config/cluster-login-config/debian/screensaver_logout.sh
___________________________________________________________________
Added: svn:executable
+ *
