--- daemon-util.old	2015-09-21 17:31:13.585639487 +0200
+++ daemon-util.old	2015-09-21 17:30:42.456555070 +0200
@@ -56,8 +56,6 @@ 
 
 if _is_master; then
   DAEMONS+=( ganeti-wconfd ganeti-rapi ganeti-luxid )
-else
-  DAEMONS+=( ganeti-rapi )
 fi
 
 DAEMONS+=( ganeti-kvmd )
@@ -257,7 +255,7 @@ 
       return 1
     fi
   elif type -p start-stop-daemon >/dev/null; then
-    start-stop-daemon --stop --signal 0 --quiet \
+    start-stop-daemon --signal 0 --quiet \
       --pidfile $pidfile
   else
     _ignore_error status \