shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-01 05:47:04 +03:00
Code

systemctl: allow 'systemctl reboot -ff' to succeed even without D-Bus

Browse Source
This commit is contained in:
Lennart Poettering 2012-05-03 16:29:15 +02:00
parent c32b90dec7
commit 3beddc7861
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/systemctl/systemctl.c
View File

@ -1783,7 +1783,6 @@ static int start_special(DBusConnection *bus, char **args) {
enum action a;
int r;
assert(bus);
assert(args);
a = verb_to_action(args[0]);
@ -5204,7 +5203,9 @@ static int systemctl_main(DBusConnection *bus, int argc, char *argv[], DBusError
return 0;
}
if (!bus) {
if (((!streq(verbs[i].verb, "reboot") &&
!streq(verbs[i].verb, "halt") &&
!streq(verbs[i].verb, "reboot")) || arg_force <= 0) && !bus) {
log_error("Failed to get D-Bus connection: %s",
dbus_error_is_set(error) ? error->message : "No connection to service manager.");
return -EIO;