2015-02-13 10:43:21 +01:00
|
|
|
---
|
2015-06-23 14:56:50 +02:00
|
|
|
src/basic/def.h | 2 +-
|
2015-02-13 10:43:21 +01:00
|
|
|
src/libsystemd/sd-bus/sd-bus.c | 4 ++--
|
|
|
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
|
|
2015-06-23 14:56:50 +02:00
|
|
|
Index: systemd-221/src/basic/def.h
|
2015-02-13 10:43:21 +01:00
|
|
|
===================================================================
|
2015-06-23 14:56:50 +02:00
|
|
|
--- systemd-221.orig/src/basic/def.h
|
|
|
|
|
+++ systemd-221/src/basic/def.h
|
|
|
|
|
@@ -61,7 +61,7 @@
|
|
|
|
|
"/usr/lib/kbd/keymaps/\0"
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
-#define UNIX_SYSTEM_BUS_ADDRESS "unix:path=/var/run/dbus/system_bus_socket"
|
|
|
|
|
+#define UNIX_SYSTEM_BUS_ADDRESS "unix:path=/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"
|
|
|
|
|
Index: systemd-221/src/libsystemd/sd-bus/sd-bus.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- systemd-221.orig/src/libsystemd/sd-bus/sd-bus.c
|
|
|
|
|
+++ systemd-221/src/libsystemd/sd-bus/sd-bus.c
|
|
|
|
|
@@ -837,8 +837,8 @@ static int parse_container_unix_address(
|
2015-02-16 12:36:25 +01:00
|
|
|
b->nspid = 0;
|
2014-03-12 15:31:57 +01:00
|
|
|
|
|
|
|
|
b->sockaddr.un.sun_family = AF_UNIX;
|
|
|
|
|
- strncpy(b->sockaddr.un.sun_path, "/var/run/dbus/system_bus_socket", sizeof(b->sockaddr.un.sun_path));
|
|
|
|
|
- b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + strlen("/var/run/dbus/system_bus_socket");
|
|
|
|
|
+ strncpy(b->sockaddr.un.sun_path, "/run/dbus/system_bus_socket", sizeof(b->sockaddr.un.sun_path));
|
|
|
|
|
+ b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + strlen("/run/dbus/system_bus_socket");
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
