diff options
| author | Kay Sievers <kay@vrfy.org> | 2015-08-11 20:46:05 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2015-08-11 20:49:36 +0200 |
| commit | d4d00020d6ad855d65d31020fefa5003e1bb477f (patch) | |
| tree | 312c253adaf27c87c111d20a116df40a6496e468 /src/basic | |
| parent | Merge pull request #929 from kaysievers/gpt (diff) | |
| download | systemd-d4d00020d6ad855d65d31020fefa5003e1bb477f.tar.xz systemd-d4d00020d6ad855d65d31020fefa5003e1bb477f.zip | |
sd-bus: do not connect to dbus-1 socket when kdbus is available
We should not fall back to dbus-1 and connect to the proxy when kdbus
returns an error that indicates that kdbus is running but just does not
accept new connections because of quota limits or something similar.
Using is_kdbus_available() in libsystemd/ requires it to move from
shared/ to libsystemd/.
Based on a patch from David Herrmann:
https://github.com/systemd/systemd/pull/886
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/def.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/basic/def.h b/src/basic/def.h index 5aaba1fe87..e0d6822f38 100644 --- a/src/basic/def.h +++ b/src/basic/def.h @@ -63,7 +63,6 @@ #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" |