diff options
| author | Joachim Nilsson <troglobit@gmail.com> | 2017-10-13 08:02:59 +0200 |
|---|---|---|
| committer | Joachim Nilsson <troglobit@gmail.com> | 2017-10-13 08:02:59 +0200 |
| commit | 6818813ff86b99436d1ceef0012c5f65f360c17e (patch) | |
| tree | bb9ffe593f373fca64df0154f1df3b5b1ed6195f | |
| parent | 5b8f7ce2a3f745b80dce9ac59d39ad5c5c946da3 (diff) | |
| download | finit-6818813ff86b99436d1ceef0012c5f65f360c17e.zip finit-6818813ff86b99436d1ceef0012c5f65f360c17e.tar.gz finit-6818813ff86b99436d1ceef0012c5f65f360c17e.tar.bz2 | |
plugins/dbus: Conditionalize, don't run if dbus-daemon is missing
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
| -rw-r--r-- | plugins/dbus.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/plugins/dbus.c b/plugins/dbus.c index efaae48..5624468 100644 --- a/plugins/dbus.c +++ b/plugins/dbus.c @@ -31,14 +31,23 @@ static void setup(void *arg) { + if (!whichp("dbus-daemon")) { + _d("Skipping D-Bus plugin, dbus-daemon is not installed."); + return; + } + umask(0); _d("Starting D-Bus ..."); makedir("/var/run/dbus", 0755); makedir("/var/lock/subsys", 0755); makedir("/var/lock/subsys/messagebus", 0755); - run("dbus-uuidgen --ensure"); + if (whichp("dbus-uuidgen")) + run("dbus-uuidgen --ensure"); + + /* Clean up from any previous pre-bootstrap run */ erase("/var/run/dbus/pid"); + run_interactive("dbus-daemon --system", "Starting D-Bus"); umask(022); |