[systemd-commits] 2 commits - README man/runlevel.xml src/libsystemd

[Lennart Poettering]

 README                         |    3 +++
 man/runlevel.xml               |    2 +-
 src/libsystemd/sd-bus/sd-bus.c |    4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 47bc23c18cbc87471dc832534c8565625e4a9d16
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Feb 26 02:54:37 2014 +0100

    README: document that /var/run must be a symlink → /run

diff --git a/README b/README
index b918132..7a227e7 100644
--- a/README
+++ b/README
@@ -190,6 +190,9 @@ WARNINGS:
         about this, since this kind of file system setup is not really
         supported anymore by the basic set of Linux OS components.
 
+        systemd requires that the /run mount point exists. systemd also
+        requires that /var/run is a a symlink → /run.
+
         For more information on this issue consult
         http://freedesktop.org/wiki/Software/systemd/separate-usr-is-broken
 

commit df1e02046144f41176c32ed011369fd8dba36b76
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Feb 26 02:47:43 2014 +0100

    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.

diff --git a/man/runlevel.xml b/man/runlevel.xml
index 4db06dc..976753a 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 1318272..636715f 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;
 }