From cd791afea5e9dad492f603d6377549a09ae1b1bb Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Thu, 1 Mar 2018 00:22:01 +0100 Subject: [PATCH] Revert "dbus: Use --syslog-only instead of Finit built-in log redirect" This reverts commit df89cc79b9ae6fb15d3874cf713c4ca81254426c. Not all distros (Debian, Alpine) have a dbus-daemon that supports --syslog-only Signed-off-by: Joachim Nilsson --- plugins/dbus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/dbus.c b/plugins/dbus.c index 6f5d030c..b3a0860a 100644 --- a/plugins/dbus.c +++ b/plugins/dbus.c @@ -32,7 +32,7 @@ #include "conf.h" #define DAEMON "dbus-daemon" -#define ARGS "--nofork --system --syslog-only" +#define ARGS "--nofork --system" #define DESC "D-Bus message bus daemon" static void setup(void *arg) @@ -58,7 +58,7 @@ static void setup(void *arg) erase("/var/run/dbus/pid"); /* Register service with Finit */ - snprintf(line, sizeof(line), "[S12345] %s %s -- %s", cmd, ARGS, DESC); + snprintf(line, sizeof(line), "[S12345] log:prio:daemon.info,tag:dbus %s %s -- %s", cmd, ARGS, DESC); if (service_register(SVC_TYPE_SERVICE, line, global_rlimit, NULL)) _pe("Failed registering %s", DAEMON); free(cmd);