Handle multiple requests to start same daemon

Templates will ask to start already running daemon, this is okay.

1 files changed, 7 insertions, 9 deletions

diff --git a/scripts/quagga-manager b/scripts/quagga-manager
index 383616e0..85bfec98 100755
--- a/scripts/quagga-manager
+++ b/scripts/quagga-manager
@@ -42,26 +42,24 @@ start() {
 	return 1
     fi
 
-    # already running?
-    pidofproc $pidfile $daemon >/dev/null && return 0
-    
-    local -a args=( -d -P 0 -i ${pid_dir}/${daemon}.pid )
+    local -a args=( -d -P 0 -i $pidfile )
     if [ "$daemon" = "zebra" ]; then
 	args+=( -l -S -s 1048576 )
     fi
 
-    start-stop-daemon --start --quiet \
-	--chdir $log_dir --exec $binpath \
-	-- "${args[@]}"
+    exec start-stop-daemon --start --oknodo --quiet --name $daemon  \
+		--chdir $log_dir --exec $binpath --pidfile $pidfile \
+		-- ${args[@]}
 }
 
 stop() {
     local daemon=$1
+    local pidfile=${pid_dir}/${daemon}.pid
     local binpath=/usr/sbin/vyatta-$daemon
 
     start-stop-daemon --stop --quiet --oknodo --retry 5 \
-	--exec $binpath --pidfile=$pid_dir/${daemon}.pid
-    rm -f $pid_dir/${daemon}.pid
+	--name $daemon --exec $binpath --pidfile=$pidfile
+    rm -f $pidfile
 }
 
 get_protocol() {