Merge branch '2.8.x'

puppetlabs · Aug 27, 2015 · 0028487533ff4275aeb42d06359ae9c14d570951 · 0028487
2 parents 51c0e87 + f1f3dc4
commit 0028487533ff4275aeb42d06359ae9c14d570951
Unified Split

Showing with 2 additions and 2 deletions.

+2 −2 ext/aio/suse/mcollective.init
diff --git a/ext/aio/suse/mcollective.init b/ext/aio/suse/mcollective.init
@@ -73,7 +73,7 @@ case "$1" in
        # Remember status and be verbose
        rc_status -v
        ;;
-    try-restart|force-reload)
+    try-restart|condrestart|force-reload)
        ## Stop the service and if this succeeds (i.e. the
        ## service was running before), start it again.
        $0 status &> /dev/null
@@ -112,7 +112,7 @@ case "$1" in
        rc_status -v
        ;;
    *)
-        echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload}"
+        echo "Usage: $0 {start|stop|status|try-restart|condrestart|restart|force-reload}"
        exit 1
        ;;
 esac