From d718a27abf3049f7892a1ed5b0ee94fa610e7df3 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Mon, 20 Sep 2021 10:35:54 +0200 Subject: [PATCH] dbus: dont hard-code daemon user/pidfile Both DBUS user and pidfile is configurable in DBUS compilation, by passing "--with-dbus-user=" and "--with-system-pid-file=", let's avoid hard-coding them here, use macros instead. Signed-off-by: Ming Liu --- plugins/dbus.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/plugins/dbus.c b/plugins/dbus.c index 472bac41..c1600611 100644 --- a/plugins/dbus.c +++ b/plugins/dbus.c @@ -35,7 +35,13 @@ #define ARGS "--nofork --system --syslog-only" #define DESC "D-Bus message bus daemon" +#ifndef DAEMONUSER #define DAEMONUSER "messagebus" +#endif + +#ifndef DAEMONPIDFILE +#define DAEMONPIDFILE "/var/run/dbus/pid" +#endif static void setup(void *arg) { @@ -61,11 +67,11 @@ static void setup(void *arg) run_interactive("dbus-uuidgen --ensure", "Creating machine UUID for D-Bus"); /* Clean up from any previous pre-bootstrap run */ - remove("/var/run/dbus/pid"); + remove(DAEMONPIDFILE); /* Register service with Finit */ - snprintf(line, sizeof(line), "[S12345789] cgroup.system @%s:%s %s %s -- %s", - DAEMONUSER, DAEMONUSER, cmd, ARGS, DESC); + snprintf(line, sizeof(line), "[S12345789] cgroup.system pid:!%s @%s:%s %s %s -- %s", + DAEMONPIDFILE, DAEMONUSER, DAEMONUSER, cmd, ARGS, DESC); if (service_register(SVC_TYPE_SERVICE, line, global_rlimit, NULL)) _pe("Failed registering %s", DAEMON); free(cmd);