diff options
Diffstat (limited to 'units')
| -rw-r--r-- | units/.gitignore | 4 | ||||
| -rw-r--r-- | units/systemd-bus-proxyd.service.m4.in (renamed from units/user/systemd-bus-proxyd@.service.in) | 11 | ||||
| -rw-r--r-- | units/systemd-bus-proxyd.socket | 1 | ||||
| -rw-r--r-- | units/systemd-bus-proxyd@.service.m4.in | 22 | ||||
| -rw-r--r-- | units/user/.gitignore | 2 | ||||
| -rw-r--r-- | units/user/systemd-bus-proxyd.service.in | 13 | ||||
| -rw-r--r-- | units/user/systemd-bus-proxyd.socket | 1 |
7 files changed, 23 insertions, 31 deletions
diff --git a/units/.gitignore b/units/.gitignore index e44ccfefbe..541d7bec71 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -1,4 +1,4 @@ -/systemd-bus-proxyd@.service.m4 +/systemd-bus-proxyd.service.m4 /user@.service.m4 /console-getty.service /console-getty.service.m4 @@ -24,7 +24,7 @@ /systemd-backlight@.service /systemd-binfmt.service /systemd-bootchart.service -/systemd-bus-proxyd@.service +/systemd-bus-proxyd.service /systemd-firstboot.service /systemd-fsck-root.service /systemd-fsck@.service diff --git a/units/user/systemd-bus-proxyd@.service.in b/units/systemd-bus-proxyd.service.m4.in index 0ab5462ed5..ffaf0bdc87 100644 --- a/units/user/systemd-bus-proxyd@.service.in +++ b/units/systemd-bus-proxyd.service.m4.in @@ -9,8 +9,11 @@ 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=/sys/fs/kdbus/%U-user/bus xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +ExecStart=@rootlibexecdir@/systemd-bus-proxyd --address=kernel:path=/sys/fs/kdbus/0-system/bus NotifyAccess=main +CapabilityBoundingSet=CAP_IPC_OWNER CAP_SETUID CAP_SETGID CAP_SETPCAP m4_ifdef(`HAVE_SMACK', CAP_MAC_ADMIN ) +PrivateTmp=yes +PrivateDevices=yes +PrivateNetwork=yes +ProtectSystem=full +ProtectHome=yes diff --git a/units/systemd-bus-proxyd.socket b/units/systemd-bus-proxyd.socket index 6c42d388b4..3f80a1d547 100644 --- a/units/systemd-bus-proxyd.socket +++ b/units/systemd-bus-proxyd.socket @@ -10,4 +10,3 @@ Description=Legacy D-Bus Protocol Compatibility Socket [Socket] ListenStream=/var/run/dbus/system_bus_socket -Accept=yes diff --git a/units/systemd-bus-proxyd@.service.m4.in b/units/systemd-bus-proxyd@.service.m4.in deleted file mode 100644 index 3f3ab64dee..0000000000 --- a/units/systemd-bus-proxyd@.service.m4.in +++ /dev/null @@ -1,22 +0,0 @@ -# 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 --drop-privileges --address=kernel:path=/sys/fs/kdbus/0-system/bus xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -NotifyAccess=main -CapabilityBoundingSet=CAP_IPC_OWNER CAP_SETUID CAP_SETGID CAP_SETPCAP m4_ifdef(`HAVE_SMACK', CAP_MAC_ADMIN ) -PrivateTmp=yes -PrivateDevices=yes -PrivateNetwork=yes -ProtectSystem=full -ProtectHome=yes diff --git a/units/user/.gitignore b/units/user/.gitignore index c91ed626c8..6111b10ccf 100644 --- a/units/user/.gitignore +++ b/units/user/.gitignore @@ -1,3 +1,3 @@ /systemd-exit.service -/systemd-bus-proxyd@.service +/systemd-bus-proxyd.service /systemd-consoled.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..e1e399dc32 --- /dev/null +++ b/units/user/systemd-bus-proxyd.service.in @@ -0,0 +1,13 @@ +# 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] +ExecStart=@rootlibexecdir@/systemd-bus-proxyd --address=kernel:path=/sys/fs/kdbus/%U-user/bus +NotifyAccess=main diff --git a/units/user/systemd-bus-proxyd.socket b/units/user/systemd-bus-proxyd.socket index 412052a88f..b9efc0e7ce 100644 --- a/units/user/systemd-bus-proxyd.socket +++ b/units/user/systemd-bus-proxyd.socket @@ -10,4 +10,3 @@ Description=Legacy D-Bus Protocol Compatibility Socket [Socket] ListenStream=%t/bus -Accept=yes |