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

plugins: dbus: simplify, use mksubsys(), run as messagebus user

Browse Source 
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2021-03-13 09:26:14 +01:00
1 parent 1fd45c6f2e
commit 31cae6a56d
1 file changed
+8 -7
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dbus.c
+8 -7
View File
@@ -32,9 +32,11 @@
#include "conf.h" #include "conf.h"
#define DAEMON "dbus-daemon" #define DAEMON "dbus-daemon"
#define ARGS "--nofork --system" #define ARGS "--nofork --system --syslog-only"
#define DESC "D-Bus message bus daemon" #define DESC "D-Bus message bus daemon"
#define DAEMONUSER "messagebus"
static void setup(void *arg) static void setup(void *arg)
{ {
char *cmd; char *cmd;
@@ -48,17 +50,16 @@ static void setup(void *arg)
umask(0); umask(0);
makedir("/var/run/dbus", 0755); mksubsys("/var/run/dbus", 0755, DAEMONUSER, DAEMONUSER);
makedir("/var/lock/subsys", 0755);
makedir("/var/lock/subsys/messagebus", 0755);
if (whichp("dbus-uuidgen")) if (whichp("dbus-uuidgen"))
run("dbus-uuidgen --ensure"); 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 */
erase("/var/run/dbus/pid"); remove("/var/run/dbus/pid");
/* Register service with Finit */ /* Register service with Finit */
snprintf(line, sizeof(line), "[S12345] pid:!/run/dbus/pid log:prio:daemon.info,tag:dbus %s %s -- %s", cmd, ARGS, DESC); snprintf(line, sizeof(line), "[S12345] @%s:%s %s %s -- %s",
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);