summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am6
-rw-r--r--units/user/.gitignore1
-rw-r--r--units/user/systemd-bus-proxyd@.service.in16
3 files changed, 19 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index aed8c326a7..2d299d4183 100644
--- a/Makefile.am
+++ b/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 += \
diff --git a/units/user/.gitignore b/units/user/.gitignore
index 41a74f5461..6aa54754cb 100644
--- a/units/user/.gitignore
+++ b/units/user/.gitignore
@@ -1 +1,2 @@
/systemd-exit.service
+/systemd-bus-proxyd@.service
diff --git a/units/user/systemd-bus-proxyd@.service.in b/units/user/systemd-bus-proxyd@.service.in
new file mode 100644
index 0000000000..5a9f31cd83
--- /dev/null
+++ b/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