Merge branch 'devel-2.5'

[ganeti-local] / doc / examples / ganeti.initd.in

diff --git a/doc/examples/ganeti.initd.in b/doc/examples/ganeti.initd.in
index 617d06d..cd137bd 100644 (file)
--- a/doc/examples/ganeti.initd.in
+++ b/doc/examples/ganeti.initd.in
@@ -14,16 +14,11 @@
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
 DESC="Ganeti cluster"
 
-NODED="ganeti-noded"
-MASTERD="ganeti-masterd"
-CONFD="ganeti-confd"
-RAPI="ganeti-rapi"
-
 DAEMON_UTIL=@PKGLIBDIR@/daemon-util
 
 SCRIPTNAME="@SYSCONFDIR@/init.d/ganeti"
 
-test -f "@PREFIX@/sbin/$NODED" || exit 0
+test -f "$DAEMON_UTIL" || exit 0
 
 . /lib/lsb/init-functions
 
@@ -69,23 +64,19 @@ start_all() {
         exit 0
     fi
 
-    for i in $NODED $MASTERD $CONFD $RAPI; do \
+    for i in $($DAEMON_UTIL list-start-daemons); do
         maybe_do "$1" start_action $i
     done
 }
 
 stop_all() {
-    for i in $RAPI $CONFD $MASTERD $NODED; do \
+    for i in $($DAEMON_UTIL list-stop-daemons); do
         maybe_do "$1" stop_action $i
     done
 }
 
-if [ -n "$2" -a \
-    "$2" != "$NODED" -a \
-    "$2" != "$CONFD" -a \
-    "$2" != "$MASTERD" -a \
-    "$2" != "$RAPI" ]; then
-    log_failure_msg "Unknown daemon '$2' requested"
+if [ -n "$2" ] && ! errmsg=$($DAEMON_UTIL is-daemon-name "$2" 2>&1); then
+    log_failure_msg "$errmsg"
     exit 1
 fi