From 28faeda47f75dd9f34e36c48237cb376a1dd889c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 27 Nov 2017 20:48:46 +0100 Subject: [PATCH] path-util: when checking systemd versions, check both lib and lib64 We need to check both to be compatible with multilib images. --- src/basic/path-util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/basic/path-util.c b/src/basic/path-util.c index 3bde1d1e01b..056fa7d6332 100644 --- a/src/basic/path-util.c +++ b/src/basic/path-util.c @@ -882,7 +882,9 @@ int systemd_installation_has_version(const char *root, unsigned minimal_version) * for Gentoo which does a merge without making /lib a symlink. */ "lib/systemd/libsystemd-shared-*.so\0" - "usr/lib/systemd/libsystemd-shared-*.so\0") { + "lib64/systemd/libsystemd-shared-*.so\0" + "usr/lib/systemd/libsystemd-shared-*.so\0" + "usr/lib64/systemd/libsystemd-shared-*.so\0") { _cleanup_strv_free_ char **names = NULL; _cleanup_free_ char *path = NULL; -- 2.47.3