[25446] in Source-Commits
/svn/athena r24990 - trunk/debathena/debathena/xsession/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Mar 1 14:04:21 2011
Date: Tue, 1 Mar 2011 14:04:14 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201103011904.p21J4EK3019100@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-03-01 14:04:14 -0500 (Tue, 01 Mar 2011)
New Revision: 24990
Added:
trunk/debathena/debathena/xsession/debian/00debathena-check-afs
trunk/debathena/debathena/xsession/debian/debathena-check-afs.sh
Modified:
trunk/debathena/debathena/xsession/debian/changelog
trunk/debathena/debathena/xsession/debian/debathena-xsession.install
Log:
In xsession:
* Inform the user that they will lose if there's no AFS
Added: trunk/debathena/debathena/xsession/debian/00debathena-check-afs
===================================================================
--- trunk/debathena/debathena/xsession/debian/00debathena-check-afs (rev 0)
+++ trunk/debathena/debathena/xsession/debian/00debathena-check-afs 2011-03-01 19:04:14 UTC (rev 24990)
@@ -0,0 +1,2 @@
+[ -f /usr/share/debathena-xsession/debathena-check-afs.sh ] && \
+ . /usr/share/debathena-xsession/debathena-check-afs.sh
Modified: trunk/debathena/debathena/xsession/debian/changelog
===================================================================
--- trunk/debathena/debathena/xsession/debian/changelog 2011-03-01 16:49:37 UTC (rev 24989)
+++ trunk/debathena/debathena/xsession/debian/changelog 2011-03-01 19:04:14 UTC (rev 24990)
@@ -2,8 +2,9 @@
* Don't use dpkg-query because it slows logins down; instead ship actual
scripts in /usr/share and source them (Trac #778)
+ * Inform the user that they will lose if there's no AFS
- -- Jonathan Reed <jdreed@mit.edu> Wed, 23 Feb 2011 20:17:06 -0500
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 01 Mar 2011 12:44:58 -0500
debathena-xsession (1.16) unstable; urgency=low
Added: trunk/debathena/debathena/xsession/debian/debathena-check-afs.sh
===================================================================
--- trunk/debathena/debathena/xsession/debian/debathena-check-afs.sh (rev 0)
+++ trunk/debathena/debathena/xsession/debian/debathena-check-afs.sh 2011-03-01 19:04:14 UTC (rev 24990)
@@ -0,0 +1,6 @@
+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
+ fi
+fi
Modified: trunk/debathena/debathena/xsession/debian/debathena-xsession.install
===================================================================
--- trunk/debathena/debathena/xsession/debian/debathena-xsession.install 2011-03-01 16:49:37 UTC (rev 24989)
+++ trunk/debathena/debathena/xsession/debian/debathena-xsession.install 2011-03-01 19:04:14 UTC (rev 24990)
@@ -1,12 +1,21 @@
debian/000debathena-nocalls.desktop usr/share/xsessions
debian/001debathena-ttymode.desktop usr/share/xsessions
+debian/00debathena-check-afs etc/X11/Xsession.d
+debian/debathena-check-afs.sh usr/share/debathena-xsession
debian/00debathena-message etc/X11/Xsession.d
+debian/debathena-message.sh usr/share/debathena-xsession
debian/00debathena-gdm-sucks etc/X11/Xsession.d
+debian/debathena-gdm-sucks.sh usr/share/debathena-xsession
debian/00debathena-tcsh-sucks etc/X11/Xsession.d
+debian/debathena-tcsh-sucks.sh usr/share/debathena-xsession
debian/01debathena-quota etc/X11/Xsession.d
+debian/debathena-quota.sh usr/share/debathena-xsession
debian/05debathena-nocalls etc/X11/Xsession.d
+debian/debathena-nocalls.sh usr/share/debathena-xsession
debian/96debathena-tracker etc/X11/Xsession.d
+debian/debathena-tracker.sh usr/share/debathena-xsession
debian/97debathena-homedir-mode etc/X11/Xsession.d
+debian/debathena-homedir-mode.sh usr/share/debathena-xsession
debian/98debathena-xsession etc/X11/Xsession.d
debian/athena-initial-x-terminal.desktop etc/xdg/autostart
debian/displaylert usr/lib/init
@@ -15,10 +24,3 @@
debian/quotawarn usr/lib/init
debian/xsession.bash usr/lib/init
debian/xsession.tcsh usr/lib/init
-debian/debathena-gdm-sucks.sh usr/share/debathena-xsession
-debian/debathena-homedir-mode.sh usr/share/debathena-xsession
-debian/debathena-message.sh usr/share/debathena-xsession
-debian/debathena-nocalls.sh usr/share/debathena-xsession
-debian/debathena-quota.sh usr/share/debathena-xsession
-debian/debathena-tcsh-sucks.sh usr/share/debathena-xsession
-debian/debathena-tracker.sh usr/share/debathena-xsession
