diff options
author | Daniel Mack <daniel@zonque.org> | 2016-02-12 15:25:27 +0100 |
---|---|---|
committer | Daniel Mack <daniel@zonque.org> | 2016-02-12 19:10:01 +0100 |
commit | 798c486fbcdce3346cd862c52e1a200bb8a2cb23 (patch) | |
tree | 2b6db348fc2e0d7623899195c14a7718b27f3f16 /units | |
parent | 736ffecc9cf58a0d2c5f147a1f56f2c3532c10ce (diff) | |
download | systemd-798c486fbcdce3346cd862c52e1a200bb8a2cb23.tar.gz |
remove bus-proxyd
As kdbus won't land in the anticipated way, the bus-proxy is not needed in
its current form. It can be resurrected at any time thanks to the history,
but for now, let's remove it from the sources. If we'll have a similar tool
in the future, it will look quite differently anyway.
Note that stdio-bridge is still available. It was restored from a version
prior to f252ff17, and refactored to make use of the current APIs.
Diffstat (limited to 'units')
-rw-r--r-- | units/.gitignore | 2 | ||||
-rw-r--r-- | units/systemd-bus-proxyd.service.m4.in | 25 | ||||
-rw-r--r-- | units/systemd-bus-proxyd.socket | 12 | ||||
-rw-r--r-- | units/user/.gitignore | 1 | ||||
-rw-r--r-- | units/user/systemd-bus-proxyd.service.in | 14 | ||||
-rw-r--r-- | units/user/systemd-bus-proxyd.socket | 12 |
6 files changed, 0 insertions, 66 deletions
diff --git a/units/.gitignore b/units/.gitignore index 2fff20a052..e62fd01466 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -1,4 +1,3 @@ -/systemd-bus-proxyd.service.m4 /user@.service.m4 /console-getty.service /console-getty.service.m4 @@ -24,7 +23,6 @@ /systemd-backlight@.service /systemd-binfmt.service /systemd-bootchart.service -/systemd-bus-proxyd.service /systemd-coredump@.service /systemd-firstboot.service /systemd-fsck-root.service diff --git a/units/systemd-bus-proxyd.service.m4.in b/units/systemd-bus-proxyd.service.m4.in deleted file mode 100644 index e75cdb1a59..0000000000 --- a/units/systemd-bus-proxyd.service.m4.in +++ /dev/null @@ -1,25 +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] -ExecStart=@rootlibexecdir@/systemd-bus-proxyd --address=kernel:path=/sys/fs/kdbus/0-system/bus -ExecReload=@bindir@/busctl --address=unix:path=/run/dbus/system_bus_socket call org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus ReloadConfig -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 - -# The proxy manages connections of all users, so it needs an elevated file -# limit. It does proper per-user accounting (indirectly via kdbus), therefore, -# the effective per-user limits stay the same. -LimitNOFILE=16384 diff --git a/units/systemd-bus-proxyd.socket b/units/systemd-bus-proxyd.socket deleted file mode 100644 index 3f80a1d547..0000000000 --- a/units/systemd-bus-proxyd.socket +++ /dev/null @@ -1,12 +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 Socket - -[Socket] -ListenStream=/var/run/dbus/system_bus_socket diff --git a/units/user/.gitignore b/units/user/.gitignore index ce9df9e7e1..41a74f5461 100644 --- a/units/user/.gitignore +++ b/units/user/.gitignore @@ -1,2 +1 @@ /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 deleted file mode 100644 index 6f79707b46..0000000000 --- a/units/user/systemd-bus-proxyd.service.in +++ /dev/null @@ -1,14 +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] -ExecStart=@rootlibexecdir@/systemd-bus-proxyd --address=kernel:path=/sys/fs/kdbus/%U-user/bus -ExecReload=@bindir@/busctl --address=unix:path=/run/user/%U/bus call org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus ReloadConfig -NotifyAccess=main diff --git a/units/user/systemd-bus-proxyd.socket b/units/user/systemd-bus-proxyd.socket deleted file mode 100644 index b9efc0e7ce..0000000000 --- a/units/user/systemd-bus-proxyd.socket +++ /dev/null @@ -1,12 +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 Socket - -[Socket] -ListenStream=%t/bus |