bbba62be60
- Add or port upstream bugfix patches: 0001-Fix-systemd-stdio-bridge-symlink.patch 0002-execute-free-directory-path-if-we-fail-to-remove-it-.patch 0003-Do-not-print-invalid-UTF-8-in-error-messages.patch 0004-man-document-missing-options-of-systemd-run.patch 0005-systemd-run-add-some-extra-safety-checks.patch 0006-journal-assume-that-next-entry-is-after-previous-ent.patch 0007-journal-forget-file-after-encountering-an-error.patch 0008-core-correctly-unregister-PIDs-from-PID-hashtables.patch 0009-logind-fix-reference-to-systemd-user-sessions.servic.patch 0010-man-update-link-to-LSB.patch 0011-man-systemd-bootchart-fix-spacing-in-command.patch 0012-man-add-missing-comma.patch 0013-units-Do-not-unescape-instance-name-in-systemd-backl.patch - Add linker scripts as place holder of the old systemd shared libraries now all included in libsystemd.so (bnc#867128) - Make patch 1006-udev-always-rename-network.patch work again and add it again. - address missing owner functionality in systemd-tmpfiles (fate#314974) 1022-systemd-tmpfiles-ownerkeep.patch - Generate the bash completion files on the fly for the case of not having the package bash-completion around - Add or port upstream bugfix patches: 0001-nspawn-fix-detection-of-missing-proc-self-loginuid.patch 0002-cdrom_id-use-the-old-MMC-fallback.patch 0003-journalctl-refuse-extra-arguments-with-verify-and-si.patch OBS-URL: https://build.opensuse.org/request/show/225408 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=177
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
|
|
|