add sensible default

[user/henk/code/puppet/modules/s6.git] / files / etc / init.d / s6

diff --git a/files/etc/init.d/s6 b/files/etc/init.d/s6
index f99e11db8552a8ec06f267012a8c7a7524aad9f4..238b0b6c642cbfa4a84a0f326aeea058a7933a6e 100644 (file)
--- a/files/etc/init.d/s6
+++ b/files/etc/init.d/s6
@@ -35,8 +35,6 @@ case "$1" in
                        /sbin/start-stop-daemon \
                                --start \
                                --oknodo \
-                               --make-pidfile \
-                               --pidfile /run/s6-svscan.pid \
                                --background \
                                --chdir "${SCANDIR}" \
                                --exec "${DAEMON}" \
@@ -47,20 +45,10 @@ case "$1" in
        stop)
                log_daemon_msg "Stopping ${DESC}" "${NAME}"
                /usr/bin/s6-svscanctl -t "${SCANDIR}"
-               if test $? = 111; then
-                       /sbin/start-stop-daemon \
-                               --stop \
-                               --oknodo \
-                               --remove-pidfile \
-                               --pidfile /run/s6-svscan.pid \
-                               --retry TERM/60/KILL/10 \
-                               --exec /usr/bin/s6-svscan
-                       /sbin/start-stop-daemon \
-                               --stop \
-                               --oknodo \
-                               --retry TERM/60 \
-                               --exec /usr/bin/s6-supervise
-               fi
+               while $0 status
+               do
+                       sleep 0.1
+               done
                log_end_msg $?
                ;;
        force-reload|restart)