From 1b09f548c7f303b486b5b1321c06336bff72ada4 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 17 Jun 2015 16:37:55 +0200 Subject: turn kdbus support into a runtime option ./configure --enable/disable-kdbus can be used to set the default behavior regarding kdbus. If no kdbus kernel support is available, dbus-dameon will be used. With --enable-kdbus, the kernel command line option "kdbus=0" can be used to disable kdbus. With --disable-kdbus, the kernel command line option "kdbus=1" is required to enable kdbus support. --- src/core/execute.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/core/execute.c') diff --git a/src/core/execute.c b/src/core/execute.c index a6ff5ac56e..94cc101738 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -1514,7 +1514,6 @@ static int exec_child( } } -#ifdef ENABLE_KDBUS if (params->bus_endpoint_fd >= 0 && context->bus_endpoint) { uid_t ep_uid = (uid == UID_INVALID) ? 0 : uid; @@ -1524,7 +1523,6 @@ static int exec_child( return r; } } -#endif /* If delegation is enabled we'll pass ownership of the cgroup * (but only in systemd's own controller hierarchy!) to the -- cgit v1.2.3-54-g00ecf