wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-11-06 15:51:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbus: dont hard-code daemon user/pidfile

Browse Source 
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 <liu.ming50@gmail.com>
This commit is contained in:
Ming Liu committed 2021-09-21 10:48:25 +02:00
1 parent aef3b4117d
commit d718a27abf
1 file changed
+9 -3
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dbus.c
+9 -3
View File
@@ -35,7 +35,13 @@
#define ARGS "--nofork --system --syslog-only" #define ARGS "--nofork --system --syslog-only"
#define DESC "D-Bus message bus daemon" #define DESC "D-Bus message bus daemon"
#ifndef DAEMONUSER
#define DAEMONUSER "messagebus" #define DAEMONUSER "messagebus"
#endif
#ifndef DAEMONPIDFILE
#define DAEMONPIDFILE "/var/run/dbus/pid"
#endif
static void setup(void *arg) 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"); run_interactive("dbus-uuidgen --ensure", "Creating machine UUID for D-Bus");
/* Clean up from any previous pre-bootstrap run */ /* Clean up from any previous pre-bootstrap run */
remove("/var/run/dbus/pid"); remove(DAEMONPIDFILE);
/* Register service with Finit */ /* Register service with Finit */
snprintf(line, sizeof(line), "[S12345789] cgroup.system @%s:%s %s %s -- %s", snprintf(line, sizeof(line), "[S12345789] cgroup.system pid:!%s @%s:%s %s %s -- %s",
DAEMONUSER, DAEMONUSER, cmd, ARGS, DESC); DAEMONPIDFILE, DAEMONUSER, DAEMONUSER, cmd, ARGS, DESC);
if (service_register(SVC_TYPE_SERVICE, line, global_rlimit, NULL)) if (service_register(SVC_TYPE_SERVICE, line, global_rlimit, NULL))
_pe("Failed registering %s", DAEMON); _pe("Failed registering %s", DAEMON);
free(cmd); free(cmd);