diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2015-08-27 16:32:22 +0200 |
|---|---|---|
| committer | David Herrmann <dh.herrmann@gmail.com> | 2015-08-27 16:32:22 +0200 |
| commit | 057171efc103ac76c60a2a0d277d8bbf25415c21 (patch) | |
| tree | 1f86acb043d5bf79725d89240c377fe2ed679066 /src/basic | |
| parent | 8faae625dc9b6322db452937f54176e56e65265a (diff) | |
Revert "sd-bus: do not connect to dbus-1 socket when kdbus is available"
This reverts commit d4d00020d6ad855d65d31020fefa5003e1bb477f. The idea of
the commit is broken and needs to be reworked. We really cannot reduce
the bus-addresses to a single address. We always will have systemd with
native clients and legacy clients at the same time, so we also need both
addresses at the same time.
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/def.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/basic/def.h b/src/basic/def.h index e0d6822f38..5aaba1fe87 100644 --- a/src/basic/def.h +++ b/src/basic/def.h @@ -63,6 +63,7 @@ #define UNIX_SYSTEM_BUS_ADDRESS "unix:path=/var/run/dbus/system_bus_socket" #define KERNEL_SYSTEM_BUS_ADDRESS "kernel:path=/sys/fs/kdbus/0-system/bus" +#define DEFAULT_SYSTEM_BUS_ADDRESS KERNEL_SYSTEM_BUS_ADDRESS ";" UNIX_SYSTEM_BUS_ADDRESS #define UNIX_USER_BUS_ADDRESS_FMT "unix:path=%s/bus" #define KERNEL_USER_BUS_ADDRESS_FMT "kernel:path=/sys/fs/kdbus/"UID_FMT"-user/bus" |