X Strike Force X.Org X11 SVN commit: r120 - in trunk/debian: . local/xdm
Author: dnusinow
Date: 2005-05-16 22:49:21 -0500 (Mon, 16 May 2005)
New Revision: 120
Modified:
trunk/debian/changelog
trunk/debian/local/xdm/Xstartup
Log:
Merge changes from xfree tree to local/xdm/Xstartup
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-05-17 03:47:35 UTC (rev 119)
+++ trunk/debian/changelog 2005-05-17 03:49:21 UTC (rev 120)
@@ -27,6 +27,7 @@
- FAQ.xhtml
- xterm.faq.html
- xvfb-run
+ - xdm/Xstartup
- Re-add jisx0208.1983-0.enc.gz to MANIFEST.all's list of font encodings
until I know more about why it was removed.
Modified: trunk/debian/local/xdm/Xstartup
===================================================================
--- trunk/debian/local/xdm/Xstartup 2005-05-17 03:47:35 UTC (rev 119)
+++ trunk/debian/local/xdm/Xstartup 2005-05-17 03:49:21 UTC (rev 120)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: Xstartup 496 2003-09-10 10:56:46Z branden $
+# $Id: Xstartup 2071 2004-12-12 20:40:44Z branden $
#
# This script is run as root after the user logs in. If this script exits with
# a return code other than 0, the user's session will not be started.
@@ -18,11 +18,11 @@
fi
fi
-# insert a utmp entry for the session
-if grep -qs '^use-sessreg' /etc/X11/xdm/xdm.options && \
- which sessreg > /dev/null 2>&1; then
- exec sessreg -a -l "$DISPLAY" -u /var/run/utmp \
- -x /etc/X11/xdm/Xservers "$USER"
+# Insert a utmp entry for the session.
+if grep -qs '^use-sessreg' /etc/X11/xdm/xdm.options \
+ && which sessreg >/dev/null 2>&1; then
+ exec sessreg -a -l "$DISPLAY" -u /var/run/utmp \
+ -x /etc/X11/xdm/Xservers "$USER"
# NOTREACHED
fi
Reply to: