]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
path-util: when checking systemd versions, check both lib and lib64
authorLennart Poettering <lennart@poettering.net>
Mon, 27 Nov 2017 19:48:46 +0000 (20:48 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 5 Dec 2017 12:44:34 +0000 (13:44 +0100)
We need to check both to be compatible with multilib images.

src/basic/path-util.c

index 3bde1d1e01bf3ddae470a5f9b2520e95d8965040..056fa7d63324e68cb0f12a654c77c3d39eba5864 100644 (file)
@@ -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;