Author: branden
Date: 2003-09-10 05:56:46 -0500 (Wed, 10 Sep 2003)
New Revision: 496
Modified:
trunk/debian/changelog
trunk/debian/local/xdm/Xstartup
Log:
debian/local/Xstartup: a bit of cleanup;
- quote all shell variables
- tighten up /etc/nologin conditionals to work the same but be less
redundant
- don't try to use xmessage if it's not in the path
- don't display the /etc/nologin file if it is zero-length
- add $Id$ expando and set svn:keywords property to "Id"
- better line wrapping
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-09-10 10:35:00 UTC (rev 495)
+++ trunk/debian/changelog 2003-09-10 10:56:46 UTC (rev 496)
@@ -60,8 +60,15 @@
remove_conffile_rollback(): new functions to handle the obsoletion of
conffiles across upgrades
- -- Branden Robinson <[EMAIL PROTECTED]> Wed, 10 Sep 2003 05:22:22 -0500
+ * debian/local/Xstartup: a bit of cleanup;
+ - quote all shell variables
+ - tighten up /etc/nologin conditionals to work the same but be less
+ redundant
+ - don't try to use xmessage if it's not in the path
+ - don't display the /etc/nologin file if it is zero-length
+ -- Branden Robinson <[EMAIL PROTECTED]> Wed, 10 Sep 2003 05:53:39 -0500
+
xfree86 (4.2.1-11) unstable; urgency=medium
* urgency set to medium because bug #206790 bites a lot of people (but,
Modified: trunk/debian/local/xdm/Xstartup
===================================================================
--- trunk/debian/local/xdm/Xstartup 2003-09-10 10:35:00 UTC (rev 495)
+++ trunk/debian/local/xdm/Xstartup 2003-09-10 10:56:46 UTC (rev 496)
@@ -1,28 +1,28 @@
#!/bin/sh
#
-# /etc/X11/xdm/Xstartup
+# $Id$
#
-# 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.
+# 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.
-PATH=$PATH:/usr/bin/X11
+PATH="$PATH:/usr/bin/X11"
-if grep -qs ^ignore-nologin /etc/X11/xdm/xdm.options; then
- if [ -f /etc/nologin ]; then
+if [ -e /etc/nologin ]; then
+ # always display the nologin message, if possible
+ if [ -s /etc/nologin ] && which xmessage > /dev/null 2>&1; then
xmessage -file /etc/nologin -geometry 640x480
fi
-elif [ -f /etc/nologin ]; then
- # root can log in anyway
- if [ "$(id -u)" != "0" ]; then
- xmessage -file /etc/nologin -geometry 640x480
+ if [ "$(id -u)" != "0" ] && \
+ ! grep -qs '^ignore-nologin' /etc/X11/xdm/xdm.options; then
exit 1
fi
fi
# insert a utmp entry for the session
-if grep -qs ^use-sessreg /etc/X11/xdm/xdm.options && command -v sessreg > /dev/null
2>&1; then
- exec sessreg -a -l $DISPLAY -u /var/run/utmp -x /etc/X11/xdm/Xservers $USER
+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
Property changes on: trunk/debian/local/xdm/Xstartup
___________________________________________________________________
Name: svn:keywords
+ Id
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
