chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c32b90d
)
systemctl: allow 'systemctl reboot -ff' to succeed even without D-Bus
author
Lennart Poettering
<lennart@poettering.net>
Thu, 3 May 2012 14:29:15 +0000
(16:29 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 3 May 2012 14:29:15 +0000
(16:29 +0200)
src/systemctl/systemctl.c
patch
|
blob
|
history
diff --git
a/src/systemctl/systemctl.c
b/src/systemctl/systemctl.c
index cbe6848d0335faf3f73d022207db67b3210289bf..681ad8c2116a0f6a8c12f22a88abbe47ad5b5544 100644
(file)
--- a/
src/systemctl/systemctl.c
+++ b/
src/systemctl/systemctl.c
@@
-1783,7
+1783,6
@@
static int start_special(DBusConnection *bus, char **args) {
enum action a;
int r;
enum action a;
int r;
- assert(bus);
assert(args);
a = verb_to_action(args[0]);
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;
}
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;
log_error("Failed to get D-Bus connection: %s",
dbus_error_is_set(error) ? error->message : "No connection to service manager.");
return -EIO;