dbus: change session dbus address from /run/user/uid/dbus/user_bus_socket to /usr...

Sync to upstream.

Signed-off-by: INSUN PYO <insun.pyo@samsung.com>
Change-Id: I40ac5b641e5e7484a19a3fe9d7844c3491e48846

diff --git a/src/basic/def.h b/src/basic/def.h
index 0451bd5..1a7a0f4 100644 (file)
--- a/src/basic/def.h
+++ b/src/basic/def.h
@@ -57,7 +57,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/dbus/user_bus_socket"
+#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"
 
 #define PLYMOUTH_SOCKET {                                       \

diff --git a/units/user@.service.m4.in b/units/user@.service.m4.in
index cd85cff..854fd49 100644 (file)
--- a/units/user@.service.m4.in
+++ b/units/user@.service.m4.in
@@ -19,7 +19,7 @@ Slice=user-%i.slice
 KillMode=mixed
 Delegate=yes
 TasksMax=infinity
-Environment=DBUS_SESSION_BUS_ADDRESS=kernel:path=/sys/fs/kdbus/%i-user/bus;unix:path=/run/user/%i/dbus/user_bus_socket
+Environment=DBUS_SESSION_BUS_ADDRESS=kernel:path=/sys/fs/kdbus/%i-user/bus;unix:path=/run/user/%i/bus
 Environment=XDG_RUNTIME_DIR=/run/user/%i
 Capabilities=cap_sys_admin,cap_mac_admin,cap_mac_override,cap_setgid,cap_dac_override=i
 SecureBits=keep-caps