summaryrefslogtreecommitdiff
path: root/bus/bus.c
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-04-05 13:28:54 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-04-08 12:17:28 +0100
commit2ab900b678abb6df62790549b55230215f20a8a4 (patch)
tree09ab594b96e00f1852f32778565a23ced44aaf84 /bus/bus.c
parent60511bb9951c210b82e14f8b5b1a10a744acf6bc (diff)
downloaddbus-2ab900b678abb6df62790549b55230215f20a8a4.tar.gz
Do not suppress syslog test's stderr just because init is systemd
This causes the test to fail. The assumption implicitly being made was "if pid 1 is systemd, then every caller of _dbus_init_system_log() is a systemd service" which is not valid for the regression test. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=63163 Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Colin Walters <walters@verbum.org>
Diffstat (limited to 'bus/bus.c')
-rw-r--r--bus/bus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/bus/bus.c b/bus/bus.c
index e80e7080..307c1586 100644
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -287,7 +287,7 @@ process_config_first_time_only (BusContext *context,
auth_mechanisms = NULL;
pidfile = NULL;
- _dbus_init_system_log ();
+ _dbus_init_system_log (TRUE);
if (flags & BUS_CONTEXT_FLAG_SYSTEMD_ACTIVATION)
context->systemd_activation = TRUE;