forked from pool/systemd
52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
|
From 1ae383a8a3ae4824453e297352fda603d2d3fd5e Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||
|
|
Date: Tue, 25 Feb 2014 21:26:31 -0500
|
||
|
|
Subject: [PATCH] Use /var/run/dbus/system_bus_socket for the D-Bus socket
|
||
|
|
|
||
|
|
---
|
||
|
|
man/systemd-bus-proxyd@.service.xml | 2 +-
|
||
|
|
src/shared/def.h | 2 +-
|
||
|
|
units/systemd-bus-proxyd.socket | 2 +-
|
||
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git man/systemd-bus-proxyd@.service.xml man/systemd-bus-proxyd@.service.xml
|
||
|
|
index 75a3c8b..3a5930d 100644
|
||
|
|
--- man/systemd-bus-proxyd@.service.xml
|
||
|
|
+++ 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
|
||
|
|
- <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
|
||
|
|
diff --git src/shared/def.h src/shared/def.h
|
||
|
|
index 7777756..aa489d8 100644
|
||
|
|
--- src/shared/def.h
|
||
|
|
+++ src/shared/def.h
|
||
|
|
@@ -61,7 +61,7 @@
|
||
|
|
"/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
|
||
|
|
diff --git units/systemd-bus-proxyd.socket units/systemd-bus-proxyd.socket
|
||
|
|
index 406e15b..6c42d38 100644
|
||
|
|
--- units/systemd-bus-proxyd.socket
|
||
|
|
+++ units/systemd-bus-proxyd.socket
|
||
|
|
@@ -9,5 +9,5 @@
|
||
|
|
Description=Legacy D-Bus Protocol Compatibility Socket
|
||
|
|
|
||
|
|
[Socket]
|
||
|
|
-ListenStream=/run/dbus/system_bus_socket
|
||
|
|
+ListenStream=/var/run/dbus/system_bus_socket
|
||
|
|
Accept=yes
|
||
|
|
--
|
||
|
|
1.7.9.2
|
||
|
|
|