From 3377abb5b54d2b5dde72f7b715c3912f2a4000b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sun, 21 Aug 2016 15:21:33 +0200
Subject: correct handling of the initscript stop and restart actions

---
 debian/sane-utils.saned.init | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'debian/sane-utils.saned.init')

diff --git a/debian/sane-utils.saned.init b/debian/sane-utils.saned.init
index 7b9fe18..5c87fc1 100644
--- a/debian/sane-utils.saned.init
+++ b/debian/sane-utils.saned.init
@@ -52,7 +52,7 @@ case "$1" in
   stop)
 	log_daemon_msg "Stopping $DESC" "$NAME"
 	start-stop-daemon --stop --oknodo --quiet --pidfile /var/run/$NAME.pid \
-		--exec $DAEMON
+		--retry --exec $DAEMON
 	log_end_msg $?
 	;;
   force-reload)
@@ -64,12 +64,8 @@ case "$1" in
 	;;
   restart)
 	log_daemon_msg "Restarting $DESC" "$NAME"
-	start-stop-daemon --stop --oknodo --quiet --pidfile \
-		/var/run/$NAME.pid --exec $DAEMON
-	sleep 1
-	start-stop-daemon --start --quiet --pidfile \
-		/var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
-	log_end_msg $?
+	$0 stop
+	$0 start
 	;;
   status)
 	if [ -s /var/run/$NAME.pid ]; then
@@ -97,5 +93,3 @@ case "$1" in
 	exit 1
 	;;
 esac
-
-exit 0
-- 
cgit v1.2.3