Add exit status 1 if we fail to start, or reload.

Remove "oknodo" to actually provide an error message if we cannot stop the service.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1464 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/debian/varnish.init b/varnish-cache/debian/varnish.init
index e3b1319ef51785c35bf700d0375065c3a8e53dfe..9003dbac938886c905325659698fc722d8be4488 100644 (file)
--- a/varnish-cache/debian/varnish.init
+++ b/varnish-cache/debian/varnish.init
@@ -51,6 +51,7 @@ case "$1" in
                else
                        log_end_msg 1
                        cat $output
+                       exit 1
                fi
                rm $output
                ;;
@@ -58,7 +59,7 @@ case "$1" in
                log_daemon_msg "Stopping $DESC"
                log_progress_msg $NAME
                if start-stop-daemon \
-                  --stop --quiet --pidfile $PIDFILE --oknodo --retry 10 \
+                  --stop --quiet --pidfile $PIDFILE --retry 10 \
                   --exec $DAEMON; then
                        log_end_msg 0
                else

diff --git a/varnish-cache/debian/varnish.varnishlog.init b/varnish-cache/debian/varnish.varnishlog.init
index 26af531963bd299e457aa9be498f41c49a03786f..5fd6f25647c482b48434cf68a6a408ad423a69ce 100755 (executable)
--- a/varnish-cache/debian/varnish.varnishlog.init
+++ b/varnish-cache/debian/varnish.varnishlog.init
@@ -38,6 +38,7 @@ case "$1" in
                else
                        log_end_msg 1
                        cat $output
+                       exit 1
                fi
                rm $output
                ;;
@@ -45,7 +46,7 @@ case "$1" in
                log_daemon_msg "Stopping $DESC"
                log_progress_msg $NAME
                if start-stop-daemon \
-                  --stop --quiet --pidfile $PIDFILE --oknodo --retry 10 \
+                  --stop --quiet --pidfile $PIDFILE --retry 10 \
                   --exec $DAEMON; then
                        log_end_msg 0
                else