[26062] in Source-Commits
/svn/athena r25370 - trunk/debathena/debathena/xsession/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Aug 10 18:54:12 2011
Date: Wed, 10 Aug 2011 18:54:05 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201108102254.p7AMs5sW018620@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-08-10 18:54:05 -0400 (Wed, 10 Aug 2011)
New Revision: 25370
Modified:
trunk/debathena/debathena/xsession/debian/changelog
trunk/debathena/debathena/xsession/debian/debathena-check-afs.sh
Log:
In xsession:
* Don't tell private workstation owners to contact hotline (Trac: #998)
Modified: trunk/debathena/debathena/xsession/debian/changelog
===================================================================
--- trunk/debathena/debathena/xsession/debian/changelog 2011-08-10 21:59:25 UTC (rev 25369)
+++ trunk/debathena/debathena/xsession/debian/changelog 2011-08-10 22:54:05 UTC (rev 25370)
@@ -1,9 +1,10 @@
-debathena-xsession (1.17.4) UNRELEASED; urgency=low
+debathena-xsession (1.17.4) unstable; urgency=low
* Explicitly depend on gnome-session, since we have implicitly depended
on it for a while now
+ * Don't tell private workstation owners to contact hotline (Trac: #998)
- -- Jonathan Reed <jdreed@mit.edu> Fri, 29 Jul 2011 20:21:51 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 10 Aug 2011 18:53:52 -0400
debathena-xsession (1.17.3) unstable; urgency=low
Modified: trunk/debathena/debathena/xsession/debian/debathena-check-afs.sh
===================================================================
--- trunk/debathena/debathena/xsession/debian/debathena-check-afs.sh 2011-08-10 21:59:25 UTC (rev 25369)
+++ trunk/debathena/debathena/xsession/debian/debathena-check-afs.sh 2011-08-10 22:54:05 UTC (rev 25370)
@@ -1,5 +1,7 @@
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)."
+ notify="hotline@mit.edu"
+ [ "$(machtype -L)" != "debathena-cluster" ] && notify="your system administrator"
+ 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.\n\nIf the problem appears to only be on this workstation, please notify $notify 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
}
youmightlose() {
