diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-11-07 13:03:47 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-11-07 13:10:43 +0100 |
| commit | 09cb6d7b467f6d1c6685ee9ccc171f4dddbe1f42 (patch) | |
| tree | 4716df813a9a85286c1baea6cef5125aba3d37d9 | |
| parent | 5739c6f73f853c5b969f6e2ce6326d9f280fe34e (diff) | |
| download | dbus-09cb6d7b467f6d1c6685ee9ccc171f4dddbe1f42.tar.gz | |
Drop [Install] sections from user services
We install the symlink to enable dbus.socket statically, so it doesn't
make much sense to invoke `systemctl enable` on it; and
dbus.service should normally be started by socket activation
(or possibly an explicit dependency) rather than manually.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92402
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Lennart Poettering
| -rw-r--r-- | bus/systemd-user/dbus.service.in | 3 | ||||
| -rw-r--r-- | bus/systemd-user/dbus.socket.in | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/bus/systemd-user/dbus.service.in b/bus/systemd-user/dbus.service.in index b41f522b..4355d728 100644 --- a/bus/systemd-user/dbus.service.in +++ b/bus/systemd-user/dbus.service.in @@ -6,6 +6,3 @@ Requires=dbus.socket [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 - -[Install] -Also=dbus.socket diff --git a/bus/systemd-user/dbus.socket.in b/bus/systemd-user/dbus.socket.in index 4793d1d4..304ac403 100644 --- a/bus/systemd-user/dbus.socket.in +++ b/bus/systemd-user/dbus.socket.in @@ -4,7 +4,3 @@ Description=D-Bus User Message Bus Socket [Socket] ListenStream=%t/bus ExecStartPost=-@SYSTEMCTL@ --user set-environment DBUS_SESSION_BUS_ADDRESS=unix:path=%t/bus - -[Install] -WantedBy=sockets.target -Also=dbus.service |