From aa5939a3ba4a0004ced1be4d8f9b0eb7521e4cef Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Mon, 20 Sep 2010 20:45:08 +0200 Subject: [PATCH] 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 --- src/systemctl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 = -- 2.30.2