From: Michal Schmidt <mschmidt@redhat.com>
Date: Mon, 20 Sep 2010 18:45:08 +0000 (+0200)
Subject: systemctl: make condrestart equivalent to try-restart
X-Git-Tag: v11~123
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=aa5939a3ba4a0004ced1be4d8f9b0eb7521e4cef;hp=f2fcd59ffaaa97aaa238089cde5225f0e1086904

systemctl: make condrestart equivalent to try-restart

"condrestart" should be equivalent to "try-restart", i.e. it should be
translated into "TryRestartUnit". See
http://fedoraproject.org/wiki/Packaging:SysVInitScript#condrestart_and_try-restart

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=635780
---

diff --git a/src/systemctl.c b/src/systemctl.c
index 8e538d64a..525e2f0b1 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -1257,11 +1257,11 @@ static int start_unit(DBusConnection *bus, char **args, unsigned n) {
                         streq(args[0], "stop")                  ? "StopUnit" :
                         streq(args[0], "reload")                ? "ReloadUnit" :
                         streq(args[0], "restart")               ? "RestartUnit" :
-                        streq(args[0], "try-restart")           ? "TryRestartUnit" :
+                        streq(args[0], "try-restart")           ||
+                        streq(args[0], "condrestart")           ? "TryRestartUnit" :
                         streq(args[0], "reload-or-restart")     ? "ReloadOrRestartUnit" :
                         streq(args[0], "reload-or-try-restart") ||
-                        streq(args[0], "force-reload")          ||
-                        streq(args[0], "condrestart")           ? "ReloadOrTryRestartUnit" :
+                        streq(args[0], "force-reload")          ? "ReloadOrTryRestartUnit" :
                                                                   "StartUnit";
 
                 mode =