diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-02-26 02:47:43 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-02-26 02:47:43 +0100 |
| commit | df1e02046144f41176c32ed011369fd8dba36b76 (patch) | |
| tree | 2c2aff99c97ff00d3f5c0fbf022b75014f013b44 | |
| parent | 41a55c46ab8fb4ef6727434227071321fc762cce (diff) | |
Revert back to /var/run at a couple of problems
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.
| -rw-r--r-- | man/runlevel.xml | 2 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/sd-bus.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/man/runlevel.xml b/man/runlevel.xml index 4db06dc87c..976753a737 100644 --- a/man/runlevel.xml +++ b/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 a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 1318272085..636715f759 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/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; } |