Yaniv Bronhaim has uploaded a new change for review.
Change subject: Removing has_systemd from sysv script ......................................................................
Removing has_systemd from sysv script
After separating sysv and systemd common code, there is no need for has_systemd parts in sysv init script, as it doesn't in use at all over systemd.
Change-Id: Ief9be5503c84e2cf960e722e5097dbdc05b888a6 Signed-off-by: Yaniv Bronhaim ybronhei@redhat.com --- M init/sysvinit/vdsmd.init.in 1 file changed, 2 insertions(+), 11 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/06/18806/1
diff --git a/init/sysvinit/vdsmd.init.in b/init/sysvinit/vdsmd.init.in index b023fb9..ce6237e 100755 --- a/init/sysvinit/vdsmd.init.in +++ b/init/sysvinit/vdsmd.init.in @@ -150,11 +150,6 @@
stop() { echo $"Shutting down vdsm daemon: " - if has_systemd; then - kill_instance - return 0 - fi - trap cleanup SIGINT SIGHUP SIGTERM if [ -f "$LOCK_FILE" ]; then if ! pidofproc -p "$RESPAWNPIDFILE" >/dev/null; then @@ -207,11 +202,7 @@
case "$1" in start) - if has_systemd; then - start - else - locked_start - fi + locked_start RETVAL=$? ;; stop) @@ -224,7 +215,7 @@ if [ "$RETVAL" -eq 0 ]; then echo "VDS daemon server is running" else - if ! has_systemd && [ -f "$LOCK_FILE" ]; then + if [ -f "$LOCK_FILE" ]; then printf "VDS daemon dead but subsys locked" else printf "VDS daemon is not running"