bus-proxyd: support --user bus address

Makefile.am

@@ -1921,10 +1921,8 @@ dist_systemunit_DATA += \
 	units/systemd-bus-proxyd.socket
 
 dist_userunit_DATA += \
-	units/user/systemd-bus-proxyd.socket
-
-USER_UNIT_ALIASES += \
-	$(systemunitdir)/systemd-bus-proxyd@.service systemd-bus-proxyd@.service
+	units/user/systemd-bus-proxyd.socket \
+	units/user/systemd-bus-proxyd@.service
 endif
 
 EXTRA_DIST += \

units/user/.gitignore

@@ -1 +1,2 @@
 /systemd-exit.service
+/systemd-bus-proxyd@.service

units/user/systemd-bus-proxyd@.service.in

@@ -0,0 +1,16 @@
+#  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 Daemon
+
+[Service]
+# The first argument will be replaced by the service by information on
+# the process requesting the proxy, we need a placeholder to keep the
+# space available for this.
+ExecStart=@rootlibexecdir@/systemd-bus-proxyd --address=kernel:path=/dev/kdbus/%U-user/bus xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+NotifyAccess=main