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:
385771f
)
systemctl: don't use the systemd bus to talk to upstart
author
Lennart Poettering
<lennart@poettering.net>
Sat, 24 Jul 2010 00:23:40 +0000
(
02:23
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Sat, 24 Jul 2010 00:23:40 +0000
(
02:23
+0200)
src/systemctl.c
patch
|
blob
|
history
diff --git
a/src/systemctl.c
b/src/systemctl.c
index 2ae8c27d087a7237b3de9289ece68aa416f78436..d6b1fcd58102a399f33248e7c66bc086700cda1f 100644
(file)
--- a/
src/systemctl.c
+++ b/
src/systemctl.c
@@
-4516,18
+4516,17
@@
static int reload_with_fallback(DBusConnection *bus) {
static int start_with_fallback(DBusConnection *bus) {
int r;
static int start_with_fallback(DBusConnection *bus) {
int r;
-
if (bus) {
/* First, try systemd via D-Bus. */
if ((r = start_unit(bus, NULL, 0)) > 0)
goto done;
if (bus) {
/* First, try systemd via D-Bus. */
if ((r = start_unit(bus, NULL, 0)) > 0)
goto done;
-
- /* Hmm, talking to systemd via D-Bus didn't work. Then
- * let's try to talk to Upstart via D-Bus. */
- if ((r = talk_upstart()) > 0)
- goto done;
}
}
+ /* Hmm, talking to systemd via D-Bus didn't work. Then
+ * let's try to talk to Upstart via D-Bus. */
+ if ((r = talk_upstart()) > 0)
+ goto done;
+
/* Nothing else worked, so let's try
* /dev/initctl */
if ((r = talk_initctl()) != 0)
/* Nothing else worked, so let's try
* /dev/initctl */
if ((r = talk_initctl()) != 0)