clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-10-16 21:30:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemctl: conform to LSB with the "status" return code

Browse Source 
http://fedoraproject.org/wiki/Packaging:SysVInitScript#Exit_Codes_for_the_Status_Action

https://bugzilla.redhat.com/show_bug.cgi?id=975016
This commit is contained in:
Harald Hoyer
2013-06-25 13:08:27 +02:00
parent 9d64774057
commit 175728c45f
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systemctl/systemctl.c
+13 -1
View File
@@ -2658,6 +2658,7 @@ typedef struct UnitStatusInfo {
pid_t main_pid;
pid_t control_pid;
const char *status_text;
const char *pid_file;
bool running:1;
usec_t start_timestamp;
@@ -3057,6 +3058,8 @@ static int status_property(const char *name, DBusMessageIter *iter, UnitStatusIn
i->default_control_group = s;
else if (streq(name, "StatusText"))
i->status_text = s;
else if (streq(name, "PIDFile"))
i->pid_file = s;
else if (streq(name, "SysFSPath"))
i->sysfs_path = s;
else if (streq(name, "Where"))
@@ -3549,7 +3552,16 @@ static int show_one(const char *verb, DBusConnection *bus, const char *path, boo
!streq_ptr(info.active_state, "reloading") &&
streq(verb, "status"))
/* According to LSB: "program not running" */
r = 3;
/* 0: program is running or service is OK
* 1: program is dead and /var/run pid file exists
* 2: program is dead and /var/lock lock file exists
* 3: program is not running
* 4: program or service status is unknown
*/
if (info.pid_file)
r = 1;
else
r = 3;
while ((p = info.exec)) {
LIST_REMOVE(ExecStatusInfo, exec, info.exec, p);