[systemd-commits] src/systemctl.c

[Lennart Poettering]

 src/systemctl.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit aa5939a3ba4a0004ced1be4d8f9b0eb7521e4cef
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Mon Sep 20 20:45:08 2010 +0200

    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 8e538d6..525e2f0 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 =