bus: install systemd-bus-proxyd unit files for compatibility with dbus1

4 files changed, 86 insertions, 49 deletions

diff --git a/units/.gitignore b/units/.gitignore
index c5ac8fe72a..94876ed71f 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -1,66 +1,67 @@
-/systemd-backlight@.service
-/systemd-rfkill@.service
-/halt-local.service
-/rc-local.service
-/systemd-hybrid-sleep.service
-/systemd-journal-gatewayd.service
-/systemd-journal-flush.service
-/systemd-hibernate.service
-/systemd-suspend.service
 /console-getty.service
 /console-getty.service.m4
-/container-getty@.service
-/container-getty@.service.m4
-/systemd-journald.service
-/user@.service
-/systemd-logind.service
-/systemd-localed.service
-/systemd-timedated.service
-/systemd-hostnamed.service
 /console-shell.service
 /console-shell.service.m4
-/systemd-sysctl.service
-/systemd-ask-password-console.service
+/container-getty@.service
+/container-getty@.service.m4
+/debug-shell.service
+/emergency.service
+/getty@.service
+/halt-local.service
+/initrd-cleanup.service
+/initrd-parse-etc.service
+/initrd-switch-root.service
+/initrd-udevadm-cleanup-db.service
+/kmod-static-nodes.service
+/quotaon.service
+/rc-local.service
 /rescue.service
 /rescue.service.m4
+/serial-getty@.service
+/systemd-ask-password-console.service
 /systemd-ask-password-wall.service
-/systemd-quotacheck.service
-/quotaon.service
-/systemd-fsck@.service
+/systemd-backlight@.service
+/systemd-binfmt.service
+/systemd-bus-proxyd@.service
 /systemd-fsck-root.service
-/systemd-tmpfiles-clean.service
-/systemd-tmpfiles-setup.service
-/systemd-tmpfiles-setup-dev.service
+/systemd-fsck@.service
 /systemd-halt.service
-/systemd-poweroff.service
-/systemd-reboot.service
+/systemd-hibernate.service
+/systemd-hostnamed.service
+/systemd-hybrid-sleep.service
+/systemd-initctl.service
+/systemd-journal-flush.service
+/systemd-journal-gatewayd.service
+/systemd-journald.service
 /systemd-kexec.service
-/systemd-user-sessions.service
-/systemd-readahead-done.service
-/systemd-tmpfiles.service
+/systemd-localed.service
+/systemd-logind.service
+/systemd-machined.service
+/systemd-modules-load.service
+/systemd-networkd.service
+/systemd-nspawn@.service
+/systemd-poweroff.service
+/systemd-quotacheck.service
+/systemd-random-seed.service
 /systemd-readahead-collect.service
+/systemd-readahead-done.service
 /systemd-readahead-replay.service
-/serial-getty@.service
-/systemd-modules-load.service
+/systemd-reboot.service
 /systemd-remount-fs.service
-/systemd-vconsole-setup.service
+/systemd-rfkill@.service
 /systemd-shutdownd.service
-/systemd-random-seed.service
-/systemd-initctl.service
-/getty@.service
-/systemd-update-utmp.service
-/systemd-update-utmp-runlevel.service
-/systemd-binfmt.service
-/emergency.service
+/systemd-suspend.service
+/systemd-sysctl.service
+/systemd-timedated.service
+/systemd-tmpfiles-clean.service
+/systemd-tmpfiles-setup-dev.service
+/systemd-tmpfiles-setup.service
+/systemd-tmpfiles.service
 /systemd-udev-settle.service
 /systemd-udev-trigger.service
 /systemd-udevd.service
-/debug-shell.service
-/initrd-cleanup.service
-/initrd-parse-etc.service
-/initrd-switch-root.service
-/initrd-udevadm-cleanup-db.service
-/systemd-networkd.service
-/systemd-nspawn@.service
-/systemd-machined.service
-/kmod-static-nodes.service
+/systemd-update-utmp-runlevel.service
+/systemd-update-utmp.service
+/systemd-user-sessions.service
+/systemd-vconsole-setup.service
+/user@.service
diff --git a/units/systemd-bus-proxyd.socket b/units/systemd-bus-proxyd.socket
new file mode 100644
index 0000000000..e955dce51a
--- /dev/null
+++ b/units/systemd-bus-proxyd.socket
@@ -0,0 +1,12 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Legacy D-Bus Protocol Compatibility Socket
+
+[Socket]
+ListenStream=/run/dbus/system_bus_socket
diff --git a/units/systemd-bus-proxyd@.service.in b/units/systemd-bus-proxyd@.service.in
new file mode 100644
index 0000000000..93d6563201
--- /dev/null
+++ b/units/systemd-bus-proxyd@.service.in
@@ -0,0 +1,12 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Description]
+Description=Legacy D-Bus Protocol Compatibility Daemon
+
+[Service]
+ExecStart=@rootlibexecdir@/systemd-bus-proxyd
diff --git a/units/user/systemd-bus-proxyd.socket b/units/user/systemd-bus-proxyd.socket
new file mode 100644
index 0000000000..1971063bb8
--- /dev/null
+++ b/units/user/systemd-bus-proxyd.socket
@@ -0,0 +1,12 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Legacy D-Bus Protocol Compatibility Socket
+
+[Socket]
+ListenStream=%r/bus