[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r2157 - in trunk/debian/xorg/debian: . local



Author: dnusinow
Date: 2006-05-16 22:27:09 -0400 (Tue, 16 May 2006)
New Revision: 2157

Modified:
   trunk/debian/xorg/debian/changelog
   trunk/debian/xorg/debian/local/Xsession
Log:
* Set +e in Xsession prior to executing anything in Xsession.d. This should
  prevent any one bad script from killing the X startup process. Thanks
  Eduard Bloch. (closes: #331553)

Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog	2006-05-17 02:11:28 UTC (rev 2156)
+++ trunk/debian/xorg/debian/changelog	2006-05-17 02:27:09 UTC (rev 2157)
@@ -16,8 +16,11 @@
   * Add LSB dependency info to x11-common init script. Note that I have no way
     of testing it but the submitter claims that it's partially tested
     elsewhere. Thanks Petter Reinholdtsen. (closes: #335348)
+  * Set +e in Xsession prior to executing anything in Xsession.d. This should
+    prevent any one bad script from killing the X startup process. Thanks
+    Eduard Bloch. (closes: #331553)
 
- -- David Nusinow <dnusinow@debian.org>  Tue, 16 May 2006 22:11:04 -0400
+ -- David Nusinow <dnusinow@debian.org>  Tue, 16 May 2006 22:26:46 -0400
 
 xorg (1:7.0.18) unstable; urgency=low
 

Modified: trunk/debian/xorg/debian/local/Xsession
===================================================================
--- trunk/debian/xorg/debian/local/Xsession	2006-05-17 02:11:28 UTC (rev 2156)
+++ trunk/debian/xorg/debian/local/Xsession	2006-05-17 02:27:09 UTC (rev 2157)
@@ -118,9 +118,11 @@
 # other
 SESSIONFILES=$(run_parts $SYSSESSIONDIR)
 if [ -n "$SESSIONFILES" ]; then
+  set +e
   for SESSIONFILE in $SESSIONFILES; do
     . $SESSIONFILE
   done
+  set -e
 fi
 
 exit 0



Reply to: