[25476] in Source-Commits
/svn/athena r25007 - trunk/debathena/debathena/xsession/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Mar 8 19:27:38 2011
Date: Tue, 8 Mar 2011 19:27:29 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201103090027.p290RTFZ030342@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-03-08 19:27:29 -0500 (Tue, 08 Mar 2011)
New Revision: 25007
Modified:
trunk/debathena/debathena/xsession/debian/00debathena-check-afs
trunk/debathena/debathena/xsession/debian/00debathena-gdm-sucks
trunk/debathena/debathena/xsession/debian/changelog
trunk/debathena/debathena/xsession/debian/debathena-check-afs.sh
Log:
In xsession:
* Fix broken line continuation in gdm-sucks and check-afs Xsession.d
scripts
* Make check_afs more robust to libpam_debathena_home_type suckage
Modified: trunk/debathena/debathena/xsession/debian/00debathena-check-afs
===================================================================
--- trunk/debathena/debathena/xsession/debian/00debathena-check-afs 2011-03-08 21:06:33 UTC (rev 25006)
+++ trunk/debathena/debathena/xsession/debian/00debathena-check-afs 2011-03-09 00:27:29 UTC (rev 25007)
@@ -1,2 +1,2 @@
-[ -f /usr/share/debathena-xsession/debathena-check-afs.sh ] && \
+[ -f /usr/share/debathena-xsession/debathena-check-afs.sh ] && \
. /usr/share/debathena-xsession/debathena-check-afs.sh
Modified: trunk/debathena/debathena/xsession/debian/00debathena-gdm-sucks
===================================================================
--- trunk/debathena/debathena/xsession/debian/00debathena-gdm-sucks 2011-03-08 21:06:33 UTC (rev 25006)
+++ trunk/debathena/debathena/xsession/debian/00debathena-gdm-sucks 2011-03-09 00:27:29 UTC (rev 25007)
@@ -1,2 +1,2 @@
-[ -f /usr/share/debathena-xsession/debathena-gdm-sucks.sh ] && \
+[ -f /usr/share/debathena-xsession/debathena-gdm-sucks.sh ] && \
. /usr/share/debathena-xsession/debathena-gdm-sucks.sh
Modified: trunk/debathena/debathena/xsession/debian/changelog
===================================================================
--- trunk/debathena/debathena/xsession/debian/changelog 2011-03-08 21:06:33 UTC (rev 25006)
+++ trunk/debathena/debathena/xsession/debian/changelog 2011-03-09 00:27:29 UTC (rev 25007)
@@ -1,3 +1,11 @@
+debathena-xsession (1.17.1) unstable; urgency=low
+
+ * Fix broken line continuation in gdm-sucks and check-afs Xsession.d
+ scripts
+ * Make check_afs more robust to libpam_debathena_home_type suckage
+
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 08 Mar 2011 19:10:36 -0500
+
debathena-xsession (1.17) unstable; urgency=low
* Don't use dpkg-query because it slows logins down; instead ship actual
Modified: trunk/debathena/debathena/xsession/debian/debathena-check-afs.sh
===================================================================
--- trunk/debathena/debathena/xsession/debian/debathena-check-afs.sh 2011-03-08 21:06:33 UTC (rev 25006)
+++ trunk/debathena/debathena/xsession/debian/debathena-check-afs.sh 2011-03-09 00:27:29 UTC (rev 25007)
@@ -1,6 +1,16 @@
+youlose() {
+ zenity --warning --text="Your AFS home directory appears to be unavailable, and this login session cannot continue.\n\nThis could be due to an AFS outage, a network problem, or an issue with this specific workstation. We recommend you try another workstation, or a different cluster.\n\nIf the problem appears to only be on this workstation, please notify hotline@mit.edu and mention this machine's hostname ($(hostname -f)). If the problem persists on multiple workstations, please contact the IS&T Helpdesk (helpdesk@mit.edu or x3-1101)."
+ exit 0
+}
if [ "$DEBATHENA_HOME_TYPE" = "afs" ]; then
- if ! [ -d "$HOME" ]; then
- zenity --warning --text="Your AFS home directory appears to be unavailable, and this login session cannot continue.\n\nThis could be due to an AFS outage, a network problem, or an issue with this specific workstation. We recommend you try another workstation, or a different cluster.\n\nIf the problem appears to only be on this workstation, please notify hotline@mit.edu and mention this machine's hostname ($(hostname -f)). If the problem persists on multiple workstations, please contact the IS&T Helpdesk (helpdesk@mit.edu or x3-1101)."
- exit 0
+ [ -d "$HOME" ] || youlose
+elif [ "$DEBATHENA_HOME_TYPE" = "local" ] && echo "$(id -Gn | sed -e 's/ /\n/g')" | grep -q ^nss-nonlocal-users$; then
+ # DEBATHENA_HOME_TYPE=local if AFS is not running, awesome
+ # This code can get removed when Trac #838 is fixed
+ REALHOME=$HOME
+ [ -h $HOME ] && REALHOME=$(readlink $HOME)
+ if echo $REALHOME | grep -q ^/afs; then
+ fs whichcell $REALHOME || youlose
fi
fi
+
