summaryrefslogtreecommitdiff
path: root/src/machine
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2015-06-17 16:37:55 +0200
committerKay Sievers <kay@vrfy.org>2015-06-17 18:01:49 +0200
commit1b09f548c7f303b486b5b1321c06336bff72ada4 (patch)
tree0fda8c2849b2226ba773dcdc7d7d15132dbac5f6 /src/machine
parenta54941f1b47507e1609f0d8eb224f5a5a5732c0e (diff)
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.
Diffstat (limited to 'src/machine')
-rw-r--r--src/machine/machine-dbus.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index 9f026beb13..7813a0bcc7 100644
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -509,11 +509,7 @@ int bus_machine_method_open_login(sd_bus_message *message, void *userdata, sd_bu
if (r < 0)
return r;
-#ifdef ENABLE_KDBUS
# define ADDRESS_FMT "x-machine-kernel:pid=%1$" PID_PRI ";x-machine-unix:pid=%1$" PID_PRI
-#else
-# define ADDRESS_FMT "x-machine-unix:pid=%1$" PID_PRI
-#endif
if (asprintf(&address, ADDRESS_FMT, m->leader) < 0)
return log_oom();