[systemd-commits] src/systemctl

[Harald Hoyer]

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

New commits:
commit 3b05b8b3b503caf525fa72440a3f9f4bae75268b
Author: Harald Hoyer <harald at redhat.com>
Date:   Tue Jun 25 16:25:38 2013 +0200

    systemctl: conform to LSB with the "status" return code
    
    check for pid file existance before returning 1

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 71bf17d..24543ee 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -3550,7 +3550,7 @@ static int show_one(const char *verb, DBusConnection *bus, const char *path, boo
 
         if (!streq_ptr(info.active_state, "active") &&
             !streq_ptr(info.active_state, "reloading") &&
-            streq(verb, "status"))
+            streq(verb, "status")) {
                 /* According to LSB: "program not running" */
                 /* 0: program is running or service is OK
                  * 1: program is dead and /var/run pid file exists
@@ -3558,10 +3558,11 @@ static int show_one(const char *verb, DBusConnection *bus, const char *path, boo
                  * 3: program is not running
                  * 4: program or service status is unknown
                  */
-                if (info.pid_file)
+                if (info.pid_file && access(info.pid_file, F_OK) == 0)
                         r = 1;
                 else
                         r = 3;
+	}
 
         while ((p = info.exec)) {
                 LIST_REMOVE(ExecStatusInfo, exec, info.exec, p);