Use /var/run/dbus/system_bus_socket for the D-Bus socket

diff --git a/man/systemd-bus-proxyd@.service.xml b/man/systemd-bus-proxyd@.service.xml
index 75a3c8bc4f869e98a9dbc41780fa0d737c029682..3a5930d574a0d109b414c6d1b08c4c819fd630d7 100644 (file)
--- a/man/systemd-bus-proxyd@.service.xml
+++ b/man/systemd-bus-proxyd@.service.xml
@@ -59,7 +59,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     <para><filename>systemd-bus-proxyd.socket</filename> will launch
     <filename>systemd-bus-proxyd@.service</filename> for connections
     to the classic D-Bus socket in
     <para><filename>systemd-bus-proxyd.socket</filename> will launch
     <filename>systemd-bus-proxyd@.service</filename> for connections
     to the classic D-Bus socket in

-    <filename>/run/dbus/system_bus_socket</filename>.</para>
+    <filename>/var/run/dbus/system_bus_socket</filename>.</para>

 
     <para><filename>systemd-bus-proxyd@.service</filename> is launched
     for an existing D-Bus connection and will use
 
     <para><filename>systemd-bus-proxyd@.service</filename> is launched
     for an existing D-Bus connection and will use

diff --git a/src/libsystemd/sd-bus/PORTING-DBUS1 b/src/libsystemd/sd-bus/PORTING-DBUS1
index 90d184b78622bad9cc590b1a796b00ea242e068d..0253a42137850b113aee41ad5c2a4e1d373c726d 100644 (file)
--- a/src/libsystemd/sd-bus/PORTING-DBUS1
+++ b/src/libsystemd/sd-bus/PORTING-DBUS1
@@ -536,7 +536,7 @@ parameter.
 Client libraries should use the following connection string when
 connecting to the system bus:
 
 Client libraries should use the following connection string when
 connecting to the system bus:
 

-   kernel:path=/dev/kdbus/0-system/bus;unix:path=/run/dbus/system_bus_socket
+   kernel:path=/dev/kdbus/0-system/bus;unix:path=/var/run/dbus/system_bus_socket

 
 This will ensure that kdbus is preferred over the legacy AF_UNIX
 socket, but compatibility is kept. For the user bus use:
 
 This will ensure that kdbus is preferred over the legacy AF_UNIX
 socket, but compatibility is kept. For the user bus use:

diff --git a/src/shared/def.h b/src/shared/def.h
index 7777756aad457e092145be039f9a2aca151e8f5b..aa489d80d0817619fce916c793f555099a35b139 100644 (file)
--- a/src/shared/def.h
+++ b/src/shared/def.h
@@ -61,7 +61,7 @@
         "/usr/lib/kbd/keymaps/\0"
 #endif
 
         "/usr/lib/kbd/keymaps/\0"
 #endif
 

-#define UNIX_SYSTEM_BUS_PATH "unix:path=/run/dbus/system_bus_socket"
+#define UNIX_SYSTEM_BUS_PATH "unix:path=/var/run/dbus/system_bus_socket"

 #define KERNEL_SYSTEM_BUS_PATH "kernel:path=/dev/kdbus/0-system/bus"
 
 #ifdef ENABLE_KDBUS
 #define KERNEL_SYSTEM_BUS_PATH "kernel:path=/dev/kdbus/0-system/bus"
 
 #ifdef ENABLE_KDBUS

diff --git a/units/systemd-bus-proxyd.socket b/units/systemd-bus-proxyd.socket
index 406e15b5dd4dd4c4c51a3faa50da9fb1399dcabf..6c42d388b4edfaf0d8a73a3693554c2bbbb26d9e 100644 (file)
--- a/units/systemd-bus-proxyd.socket
+++ b/units/systemd-bus-proxyd.socket
@@ -9,5 +9,5 @@
 Description=Legacy D-Bus Protocol Compatibility Socket
 
 [Socket]
 Description=Legacy D-Bus Protocol Compatibility Socket
 
 [Socket]

-ListenStream=/run/dbus/system_bus_socket
+ListenStream=/var/run/dbus/system_bus_socket

 Accept=yes
 Accept=yes