[pkg-fso-commits] [SCM] Automatic Display Manager branch, master, updated. debian/0.4-4-g7a6e7e5

[Joachim Breitner]

The following commit has been merged in the master branch:
commit 7a6e7e598c162d5d53bc1b9e39ddd7f2e57960a0
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Oct 7 22:43:02 2008 +0200

    Do not complain at start when it’s already started

diff --git a/debian/nodm.init b/debian/nodm.init
index 558f30d..98b73e0 100644
--- a/debian/nodm.init
+++ b/debian/nodm.init
@@ -38,7 +38,7 @@ USER=root
 case "$1" in
     start)
         [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-        start-stop-daemon --start --pidfile ${PIDFILE} --make-pidfile --background --exec /bin/su -- --login --command "${PROG_XINIT} ${PROG_XSESSION} -- $X_OPTIONS" $USER
+        start-stop-daemon --start --oknodo --pidfile ${PIDFILE} --make-pidfile --background --exec /bin/su -- --login --command "${PROG_XINIT} ${PROG_XSESSION} -- $X_OPTIONS" $USER
         [ "$VERBOSE" != no ] && log_end_msg $?
         ;;
     stop)

-- 
Automatic Display Manager