diff options
author | INSUN PYO <insun.pyo@samsung.com> | 2017-03-21 01:36:32 +0900 |
---|---|---|
committer | INSUN PYO <insun.pyo@samsung.com> | 2017-03-29 07:32:57 -0700 |
commit | 8e6f6fdc7ea4f12f62512cee1b37dc98586efbe4 (patch) | |
tree | a53555e995558ecca4303586251c7a5fae561a9d /bus | |
parent | 2f70cc6fa74c81ebdaf69c5d3930d6265f652ab1 (diff) | |
download | dbus-8e6f6fdc7ea4f12f62512cee1b37dc98586efbe4.tar.gz dbus-8e6f6fdc7ea4f12f62512cee1b37dc98586efbe4.tar.bz2 dbus-8e6f6fdc7ea4f12f62512cee1b37dc98586efbe4.zip |
Replace user dbus.socket and dbus.service file.submit/tizen/20170329.152406accepted/tizen/wearable/20170330.223657accepted/tizen/unified/20170330.223742accepted/tizen/tv/20170330.223645accepted/tizen/mobile/20170330.223629accepted/tizen/ivi/20170330.223726accepted/tizen/common/20170330.151521
The dbus source includes dbus.socket and dbus.service for user session.
But tizen uses its own files.
Signed-off-by: INSUN PYO <insun.pyo@samsung.com>
Change-Id: Ied720b0fd5e792845ab626f680d01cbb3e9b2db9
Diffstat (limited to 'bus')
-rw-r--r-- | bus/systemd-user/dbus.service.in | 2 | ||||
-rw-r--r-- | bus/systemd-user/dbus.socket.in | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bus/systemd-user/dbus.service.in b/bus/systemd-user/dbus.service.in index b41f522b..368d1219 100644 --- a/bus/systemd-user/dbus.service.in +++ b/bus/systemd-user/dbus.service.in @@ -2,10 +2,12 @@ Description=D-Bus User Message Bus Documentation=man:dbus-daemon(1) Requires=dbus.socket +DefaultDependencies=no [Service] ExecStart=@EXPANDED_BINDIR@/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation ExecReload=@EXPANDED_BINDIR@/dbus-send --print-reply --session --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig +Capabilities=all-eip [Install] Also=dbus.socket diff --git a/bus/systemd-user/dbus.socket.in b/bus/systemd-user/dbus.socket.in index 4793d1d4..9e6f1650 100644 --- a/bus/systemd-user/dbus.socket.in +++ b/bus/systemd-user/dbus.socket.in @@ -2,8 +2,7 @@ Description=D-Bus User Message Bus Socket [Socket] -ListenStream=%t/bus -ExecStartPost=-@SYSTEMCTL@ --user set-environment DBUS_SESSION_BUS_ADDRESS=unix:path=%t/bus +ListenStream=%t/dbus/user_bus_socket [Install] WantedBy=sockets.target |