diff options
| -rw-r--r-- | bus/Makefile.am | 9 | ||||
| -rw-r--r-- | bus/systemd-system/dbus@.service.in | 17 | ||||
| -rw-r--r-- | bus/systemd-system/dbus@.socket.in | 12 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | packaging/dbus.spec | 4 |
5 files changed, 1 insertions, 43 deletions
diff --git a/bus/Makefile.am b/bus/Makefile.am index 6558ee14..5f28a25f 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -264,9 +264,6 @@ endif if DBUS_ENABLE_USER_SESSION $(mkinstalldirs) $(DESTDIR)$(systemduserunitdir)/sockets.target.wants ln -fs ../dbus.socket $(DESTDIR)$(systemduserunitdir)/sockets.target.wants/dbus.socket - - $(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/user-sockets@.target.wants - ln -fs ../dbus@.socket $(DESTDIR)$(systemdsystemunitdir)/user-sockets@.target.wants/dbus@.socket endif if DBUS_UNIX @@ -322,15 +319,11 @@ SCRIPT_IN_FILES += \ dbus.socket.in \ systemd-user/dbus.service.in \ systemd-user/dbus.socket.in \ - systemd-system/dbus@.service.in \ - systemd-system/dbus@.socket.in \ $(NULL) systemdsystemunit_DATA = \ dbus.service \ - dbus.socket \ - systemd-system/dbus@.service \ - systemd-system/dbus@.socket + dbus.socket endif if DBUS_ENABLE_USER_SESSION diff --git a/bus/systemd-system/dbus@.service.in b/bus/systemd-system/dbus@.service.in deleted file mode 100644 index e19b4435..00000000 --- a/bus/systemd-system/dbus@.service.in +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -PartOf=userlogin@%i.target -Description=D-Bus User Message Bus -Documentation=man:dbus-daemon(1) -DefaultDependencies=no -Requires=dbus@%i.socket - -[Service] -User=%i -Environment=DBUS_SESSION_BUS_ADDRESS=kernel:path=/sys/fs/kdbus/%i-user/bus;unix:path=/run/user/%i/bus -Environment=XDG_RUNTIME_DIR=/run/user/%i -SmackProcessLabel=User -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-system/dbus@.socket.in b/bus/systemd-system/dbus@.socket.in deleted file mode 100644 index 0684b28d..00000000 --- a/bus/systemd-system/dbus@.socket.in +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -PartOf=userlogin@%i.target -DefaultDependencies=no -After=systemd-logind.service -Description=D-Bus User Message Bus Socket - -[Socket] -SocketUser=%i -ListenStream=/run/user/%i/bus - -[Install] -Also=dbus.service diff --git a/configure.ac b/configure.ac index 98e6833c..2cc116aa 100644 --- a/configure.ac +++ b/configure.ac @@ -1923,8 +1923,6 @@ bus/dbus.service bus/dbus.socket bus/systemd-user/dbus.service bus/systemd-user/dbus.socket -bus/systemd-system/dbus@.service -bus/systemd-system/dbus@.socket Makefile dbus/Makefile bus/Makefile diff --git a/packaging/dbus.spec b/packaging/dbus.spec index 404a1230..4f97865b 100644 --- a/packaging/dbus.spec +++ b/packaging/dbus.spec @@ -340,10 +340,6 @@ popd %{_unitdir_user}/dbus.service %dir %{_unitdir_user}/sockets.target.wants %{_unitdir_user}/sockets.target.wants/dbus.socket -%{_unitdir}/dbus@.socket -%{_unitdir}/dbus@.service -%dir %{_unitdir}/user-sockets@.target.wants -%{_unitdir}/user-sockets@.target.wants/dbus@.socket %dir %{_sysconfdir}/dbus-1 %dir %{_datadir}/dbus-1/session.d %dir %{_datadir}/dbus-1/system.d |