From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 27 Nov 2017 19:48:46 +0000 (+0100)
Subject: path-util: when checking systemd versions, check both lib and lib64
X-Git-Tag: v236~65^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28faeda47f75dd9f34e36c48237cb376a1dd889c;p=thirdparty%2Fsystemd.git

path-util: when checking systemd versions, check both lib and lib64

We need to check both to be compatible with multilib images.
---

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;