From: INSUN PYO <insun.pyo@samsung.com>
Date: Wed, 29 Mar 2017 16:04:52 +0000 (+0900)
Subject: change user socket address from %t/dbus/user_bus_socket to %t/bus
X-Git-Tag: accepted/tizen/unified/20170605.150455^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=86343daa55afd65116eb0786d2c8ff715643de59;p=platform%2Fupstream%2Fdbus.git

change user socket address from %t/dbus/user_bus_socket to %t/bus

Sync to upstream.
Upstream uses %d/bus, but tizen uses %t/dbus/user_bus_socket.

Some application use hard coded address %d/dbus/user_bus_socket.
So, I remain SymLinks temporary.
Later changing all application, I will remove SymLinks.

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

diff --git a/bus/systemd-user/dbus.socket.in b/bus/systemd-user/dbus.socket.in
index 9e6f165..3ec71ca 100644
--- a/bus/systemd-user/dbus.socket.in
+++ b/bus/systemd-user/dbus.socket.in
@@ -2,7 +2,13 @@
 Description=D-Bus User Message Bus Socket
 
 [Socket]
-ListenStream=%t/dbus/user_bus_socket
+ListenStream=%t/bus
+
+### Temporary remain ##############
+### After changing all client #####
+### Will be removed ###############
+ExecStartPre=/usr/bin/mkdir %t/dbus
+Symlinks=%t/dbus/user_bus_socket
 
 [Install]
 WantedBy=sockets.target
diff --git a/packaging/dbus.sh b/packaging/dbus.sh
index 5f0bf73..3ea76df 100644
--- a/packaging/dbus.sh
+++ b/packaging/dbus.sh
@@ -17,6 +17,6 @@
 # If it fails to find DBUS address, the fixed address is used.
 
 if [[ -z "$DBUS_SESSION_BUS_ADDRESS" ]]; then
-   [[ "$UID" != "0" ]] && export DBUS_SESSION_BUS_ADDRESS="kernel:path=/sys/fs/kdbus/${UID}-user/bus;unix:path=/run/user/${UID}/dbus/user_bus_socket"
+   [[ "$UID" != "0" ]] && export DBUS_SESSION_BUS_ADDRESS="kernel:path=/sys/fs/kdbus/${UID}-user/bus;unix:path=/run/user/${UID}/bus"
 fi