[24243] in Source-Commits

home help back first fref pref prev next nref lref last post

/svn/athena r23841 - trunk/debathena/debathena/xsession/debian

daemon@ATHENA.MIT.EDU (Evan Broder)
Thu Jun 11 21:46:04 2009

X-Barracuda-Envelope-From: broder@mit.edu
Date: Thu, 11 Jun 2009 21:45:54 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200906120145.n5C1jsHe001419@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: broder
Date: 2009-06-11 21:45:54 -0400 (Thu, 11 Jun 2009)
New Revision: 23841

Modified:
   trunk/debathena/debathena/xsession/debian/changelog
   trunk/debathena/debathena/xsession/debian/xsession.tcsh
Log:
In xsession:
  * For tcsh users with AFS homedirs, start an xconsole following
    .xsession-errors so they can actually see the errors. (Trac: #153)


Modified: trunk/debathena/debathena/xsession/debian/changelog
===================================================================
--- trunk/debathena/debathena/xsession/debian/changelog	2009-06-12 01:41:22 UTC (rev 23840)
+++ trunk/debathena/debathena/xsession/debian/changelog	2009-06-12 01:45:54 UTC (rev 23841)
@@ -2,8 +2,10 @@
 
   * Add a new GDM session for logging in without customizations, as well
     as the Xsession machinery to make it work. (Trac: #148)
+  * For tcsh users with AFS homedirs, start an xconsole following
+    .xsession-errors so they can actually see the errors. (Trac: #153)
 
- -- Evan Broder <broder@mit.edu>  Thu, 11 Jun 2009 21:35:38 -0400
+ -- Evan Broder <broder@mit.edu>  Thu, 11 Jun 2009 21:42:31 -0400
 
 debathena-xsession (1.8) unstable; urgency=low
 

Modified: trunk/debathena/debathena/xsession/debian/xsession.tcsh
===================================================================
--- trunk/debathena/debathena/xsession/debian/xsession.tcsh	2009-06-12 01:41:22 UTC (rev 23840)
+++ trunk/debathena/debathena/xsession/debian/xsession.tcsh	2009-06-12 01:45:54 UTC (rev 23841)
@@ -6,6 +6,13 @@
 # 3. Run standard startup programs if the user has not opted out.
 # 4. Run the user's .startup.X.
 
+# Horrible work-around for the fact that GDM can't read the
+# .xsession-errors file it tries to write.
+if ( "$DEBATHENA_HOME_TYPE" == "afs" ) then
+    xconsole -daemon -file "$HOME/.xsession-errors"
+    XCONSOLE=$!
+endif
+
 set initdir=/usr/lib/init
 
 setenv XSESSION $$
@@ -45,5 +52,11 @@
   (source ~/.startup.X &)
 endif
 
+# If we got this far, then there were no errors that the user /really/
+# needed to see, so get rid of the ugly xconsole
+if ( "$DEBATHENA_HOME_TYPE" == "afs" ) then
+    kill $XCONSOLE
+endif
+
 # Proceed with the session command, which has been passed as arguments.
 exec $argv:q


home help back first fref pref prev next nref lref last post