From: Lukáš Nykrýn <lnykryn@redhat.com>
Date: Wed, 3 Aug 2016 15:08:37 +0000 (+0200)
Subject: systemctl: consider service running only when it is in active or reloading state... 
X-Git-Tag: v232~341
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f5da8bd4fb1ba49ba40195a74ca76bb5d4d1f81;p=thirdparty%2Fsystemd.git

systemctl: consider service running only when it is in active or reloading state (#3874)

Otherwise for example services that are failing on start and have Restart=on-failure
and bigger RestartSec systemctl status will return 0.

Fixes: #3864
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 782824ff384..4fa7adfc416 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4767,7 +4767,7 @@ static int show_one(
         else if (streq(verb, "status")) {
                 print_status_info(bus, &info, ellipsized);
 
-                if (info.active_state && STR_IN_SET(info.active_state, "inactive", "failed"))
+                if (info.active_state && !STR_IN_SET(info.active_state, "active", "reloading"))
                         r = EXIT_PROGRAM_NOT_RUNNING;
                 else
                         r = EXIT_PROGRAM_RUNNING_OR_SERVICE_OK;