3 files changed, 1 insertions, 37 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