forked from pool/systemd
Marcus Meissner
f35f0221c2
- Update to new upstream release 218 I really want networkd with a functioning machinectl --network-veth (broken in 13.2). OBS-URL: https://build.opensuse.org/request/show/280821 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=844
34 lines
1.4 KiB
Diff
34 lines
1.4 KiB
Diff
---
|
|
src/libsystemd/sd-bus/sd-bus.c | 4 ++--
|
|
src/shared/def.h | 2 +-
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
Index: systemd-218/src/libsystemd/sd-bus/sd-bus.c
|
|
===================================================================
|
|
--- systemd-218.orig/src/libsystemd/sd-bus/sd-bus.c
|
|
+++ systemd-218/src/libsystemd/sd-bus/sd-bus.c
|
|
@@ -791,8 +791,8 @@ static int parse_container_unix_address(
|
|
machine = NULL;
|
|
|
|
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;
|
|
}
|
|
Index: systemd-218/src/shared/def.h
|
|
===================================================================
|
|
--- systemd-218.orig/src/shared/def.h
|
|
+++ systemd-218/src/shared/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"
|
|
|
|
#ifdef ENABLE_KDBUS
|