Skip to content
Snippets Groups Projects
Commit 40dacb4d authored by Iustin Pop's avatar Iustin Pop
Browse files

Make the init script start the master daemon too

Reviewed-by: ultrotter
parent e54c4c5e
No related branches found
No related tags found
No related merge requests found
...@@ -16,6 +16,8 @@ DESC="Ganeti cluster" ...@@ -16,6 +16,8 @@ DESC="Ganeti cluster"
NAME=ganeti-noded NAME=ganeti-noded
NODED=@PREFIX@/sbin/ganeti-noded NODED=@PREFIX@/sbin/ganeti-noded
MASTER=@PREFIX@/sbin/ganeti-master MASTER=@PREFIX@/sbin/ganeti-master
MASTERD_NAME=ganeti-masterd
MASTERD="@PREFIX@/sbin/$MASTERD_NAME"
SCRIPTNAME=@SYSCONFDIR@/init.d/ganeti SCRIPTNAME=@SYSCONFDIR@/init.d/ganeti
test -f $NODED || exit 0 test -f $NODED || exit 0
...@@ -61,7 +63,12 @@ case "$1" in ...@@ -61,7 +63,12 @@ case "$1" in
log_end_msg 1 log_end_msg 1
fi fi
master_action start master_action start
;; if start-stop-daemon --start --quiet --exec $MASTERD; then
log_end_msg 0
else
log_end_msg 1
fi
;;
stop) stop)
log_daemon_msg "Stopping $DESC" "$NAME" log_daemon_msg "Stopping $DESC" "$NAME"
if start-stop-daemon --stop --quiet --name $NAME; then if start-stop-daemon --stop --quiet --name $NAME; then
...@@ -69,13 +76,20 @@ case "$1" in ...@@ -69,13 +76,20 @@ case "$1" in
else else
log_end_msg 1 log_end_msg 1
fi fi
master_action stop if start-stop-daemon --stop --quiet --name $MASTERD_NAME; then
log_end_msg 0
else
log_end_msg 1
fi
master_action stop
;; ;;
restart|force-reload) restart|force-reload)
log_daemon_msg "Reloading $DESC" log_daemon_msg "Reloading $DESC"
start-stop-daemon --stop --quiet --oknodo --retry 30 --name $NAME start-stop-daemon --stop --quiet --oknodo --retry 30 --name $NAME
start-stop-daemon --stop --quiet --oknodo --retry 30 --name $MASTERD_NAME
check_config check_config
start-stop-daemon --start --quiet --exec $NODED start-stop-daemon --start --quiet --exec $NODED
start-stop-daemon --start --quiet --exec $MASTERD
log_end_msg $? log_end_msg $?
$MASTER stop $MASTER stop
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment