diff options
| author | INSUN PYO <insun.pyo@samsung.com> | 2017-03-30 01:04:52 +0900 |
|---|---|---|
| committer | INSUN PYO <insun.pyo@samsung.com> | 2017-05-30 21:26:32 +0900 |
| commit | 86343daa55afd65116eb0786d2c8ff715643de59 (patch) | |
| tree | 17e8dc22e7ff23ceb5e0fe2a877b65f46c089e0c | |
| parent | 6261016ca921ad80a882fb09114381dc0b9cc963 (diff) | |
| download | dbus-86343daa55afd65116eb0786d2c8ff715643de59.tar.gz dbus-86343daa55afd65116eb0786d2c8ff715643de59.tar.bz2 dbus-86343daa55afd65116eb0786d2c8ff715643de59.zip | |
change user socket address from %t/dbus/user_bus_socket to %t/bussubmit/tizen/20170531.022017accepted/tizen/unified/20170605.150455
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
| -rw-r--r-- | bus/systemd-user/dbus.socket.in | 8 | ||||
| -rw-r--r-- | packaging/dbus.sh | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/bus/systemd-user/dbus.socket.in b/bus/systemd-user/dbus.socket.in index 9e6f1650..3ec71ca7 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 5f0bf73f..3ea76df4 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 |