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

diff --git a/bus/systemd-user/dbus.service.in b/bus/systemd-user/dbus.service.in
index b41f522b8af8c174d9c39a639bd56ae7a6812534..4355d72844079cc5f5ba5b4c5c75412af6782df5 100644 (file)
--- 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 4793d1d4ff1dc13ef646053bfada192b4a06ff67..304ac4034208f8110a27cd2265a1143989e320b0 100644 (file)
--- 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