[pkg-fso-commits] [nodm] 10/20: debian/nodm.init: Also check presence of system-wide Xsession and xinit executable.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository nodm.

commit 6118ccaff8897fc4e2105dbd12e291af87b5fd03
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jan 23 18:29:23 2017 +0100

    debian/nodm.init: Also check presence of system-wide Xsession and xinit executable.
---
 debian/nodm.init | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/nodm.init b/debian/nodm.init
index 6ab9738..ba16fe8 100644
--- a/debian/nodm.init
+++ b/debian/nodm.init
@@ -40,8 +40,7 @@ export NODM_XINIT NODM_XSESSION NODM_X_OPTIONS NODM_USER NODM_MIN_SESSION_TIME N
 # set allowed_users=anybody in /etc/X11/Xwrapper.config
 
 # Gracefully exit if the package or its dependencies have been removed (but not purged).
-[ -x /usr/sbin/nodm ] || exit 0
-
+[ -x /usr/sbin/nodm -a -x "$NODM_XSESSION" -a -x "$NODM_XINIT" ] || exit 0
 
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-fso/nodm.git