[pkg-fso-commits] [SCM] Automatic Display Manager branch, pamhelper, updated. debian/0.1-36-g9aa0ed2

[Enrico Zini]

The following commit has been merged in the pamhelper branch:
commit 7a26a2c1a0ac1584334ecad1797173a11337b481
Author: Enrico Zini <enrico at enricozini.org>
Date:   Fri Feb 20 14:32:42 2009 +0000

    Adapted init script to NODM_COMMAND

diff --git a/debian/nodm.init b/debian/nodm.init
index 24d4263..4c4cab9 100644
--- a/debian/nodm.init
+++ b/debian/nodm.init
@@ -19,10 +19,8 @@ PIDDIR=/var/run/
 PIDFILE=${PIDDIR}/${NAME}.pid
 
 NODM_ENABLED=no
-NODM_XINIT=/usr/bin/xinit
-NODM_XSESSION=/etc/X11/Xsession
-NODM_X_OPTIONS="vt7 -nolisten tcp"
 NODM_USER=root
+NODM_COMMAND='/usr/bin/xinit /etc/X11/Xsession -- vt7 -nolisten tcp'
 NODM_MIN_SESSION_TIME=60
 
 if [ -f /etc/default/$NAME ]
@@ -30,13 +28,13 @@ then
 	. /etc/default/$NAME
 fi
 
-export NODM_XINIT NODM_XSESSION NODM_X_OPTIONS NODM_USER NODM_MIN_SESSION_TIME
+export NODM_USER NODM_COMMAND NODM_MIN_SESSION_TIME
 
 # If you change the user to a non-root user, make sure you
 # set allowed_users=anybody in /etc/X11/Xwrapper.config
 
 # Gracefully exit if the package or its dependencies have been removed (but not purged).
-[ -x "$NODM_XSESSION" -a -x "$NODM_XINIT" ] || exit 0
+[ -x /usr/bin/nodm ] || exit 0
 
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh

-- 
Automatic Display Manager