61 lines
2.5 KiB
Diff
61 lines
2.5 KiB
Diff
|
From df1e02046144f41176c32ed011369fd8dba36b76 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lennart Poettering <lennart@poettering.net>
|
||
|
|
Date: Wed, 26 Feb 2014 02:47:43 +0100
|
||
|
|
Subject: [PATCH] Revert back to /var/run at a couple of problems
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
This partially reverts 41a55c46ab8fb4ef6727434227071321fc762cce
|
||
|
|
|
||
|
|
Some specifications we want to stay compatibility actually document
|
||
|
|
/var/run, not /run, and we should stay compatible with that. In order to
|
||
|
|
make sure our D-Bus implementation works on any system, regardless if
|
||
|
|
running systemd or not, we should always use /var/run which is the
|
||
|
|
only path mandated by the D-Bus spec.
|
||
|
|
|
||
|
|
Similar, glibc hardcodes the utmp location to /var/run, and this is
|
||
|
|
exposed in _UTMP_PATH in limits.h, hence let's stay in sync with this
|
||
|
|
public API, too.
|
||
|
|
|
||
|
|
We simply do not support systems where /var/run is not a symlink → /run.
|
||
|
|
Hence both are equivalent. Staying compatible with upstream
|
||
|
|
specifications hence weighs more than cleaning up superficial
|
||
|
|
appearance.
|
||
|
|
---
|
||
|
|
man/runlevel.xml | 2 +-
|
||
|
|
src/libsystemd/sd-bus/sd-bus.c | 4 ++--
|
||
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git man/runlevel.xml man/runlevel.xml
|
||
|
|
index 4db06dc..976753a 100644
|
||
|
|
--- man/runlevel.xml
|
||
|
|
+++ man/runlevel.xml
|
||
|
|
@@ -124,7 +124,7 @@
|
||
|
|
|
||
|
|
<variablelist>
|
||
|
|
<varlistentry>
|
||
|
|
- <term><filename>/run/utmp</filename></term>
|
||
|
|
+ <term><filename>/var/run/utmp</filename></term>
|
||
|
|
|
||
|
|
<listitem><para>The utmp database
|
||
|
|
<command>runlevel</command> reads the
|
||
|
|
diff --git src/libsystemd/sd-bus/sd-bus.c src/libsystemd/sd-bus/sd-bus.c
|
||
|
|
index 1318272..636715f 100644
|
||
|
|
--- src/libsystemd/sd-bus/sd-bus.c
|
||
|
|
+++ src/libsystemd/sd-bus/sd-bus.c
|
||
|
|
@@ -794,8 +794,8 @@ static int parse_container_unix_address(sd_bus *b, const char **p, char **guid)
|
||
|
|
machine = NULL;
|
||
|
|
|
||
|
|
b->sockaddr.un.sun_family = AF_UNIX;
|
||
|
|
- strncpy(b->sockaddr.un.sun_path, "/run/dbus/system_bus_socket", sizeof(b->sockaddr.un.sun_path));
|
||
|
|
- b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + strlen("/run/dbus/system_bus_socket");
|
||
|
|
+ strncpy(b->sockaddr.un.sun_path, "/var/run/dbus/system_bus_socket", sizeof(b->sockaddr.un.sun_path));
|
||
|
|
+ b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + strlen("/var/run/dbus/system_bus_socket");
|
||
|
|
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
1.7.9.2
|
||
|
|
|