shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

systemctl: properly detect whether taling to systemd via D-Bus worked before falling back to upstart/initctl

Browse Source
This commit is contained in:
Lennart Poettering 2010-08-13 04:53:00 +02:00
parent 0278dfeb30
commit fbc43921be
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/systemctl.c
View File

@ -1171,7 +1171,10 @@ static int start_unit(DBusConnection *bus, char **args, unsigned n) {
}
if (!arg_no_block)
r = wait_for_jobs(bus, s);
if ((r = wait_for_jobs(bus, s)) < 0)
goto finish;
r = 1;
finish:
if (s)
@ -4599,7 +4602,7 @@ static int start_with_fallback(DBusConnection *bus) {
/* Nothing else worked, so let's try
* /dev/initctl */
if (talk_initctl() != 0)
if (talk_initctl() > 0)
goto done;
log_error("Failed to talk to init daemon.");