X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fbase-filesystem.c;h=4c65a495d3596a6732b0499ad0739aeee57322fa;hp=a2201017e089306834c3588d41bc1651b75b47d7;hb=7ad63f57b6ce7ae9e3cc19dcb441f0a4494fa3f2;hpb=3577de7ac39c54821e1d1d946db65e109dfb94b2

diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
index a2201017e..4c65a495d 100644
--- a/src/shared/base-filesystem.c
+++ b/src/shared/base-filesystem.c
@@ -29,6 +29,7 @@
 #include "base-filesystem.h"
 #include "log.h"
 #include "macro.h"
+#include "strv.h"
 #include "util.h"
 #include "label.h"
 #include "mkdir.h"
@@ -37,14 +38,18 @@ typedef struct BaseFilesystem {
         const char *dir;
         mode_t mode;
         const char *target;
+        const char *exists;
 } BaseFilesystem;
 
 static const BaseFilesystem table[] = {
-        { "bin",      0, "usr/bin"   },
-        { "lib",      0, "usr/lib"   },
-        { "lib64",    0, "usr/lib64" },
-        { "root",  0755, NULL },
-        { "sbin",     0, "usr/sbin"  },
+        { "bin",      0, "usr/bin\0",                  NULL },
+        { "lib",      0, "usr/lib\0",                  NULL },
+        { "root",  0755, NULL,                         NULL },
+        { "sbin",     0, "usr/sbin\0",                 NULL },
+#if defined(__i386__) || defined(__x86_64__)
+        { "lib64",    0, "usr/lib/x86_64-linux-gnu\0"
+                         "usr/lib64\0",                "ld-linux-x86-64.so.2" },
+#endif
 };
 
 int base_filesystem_create(const char *root) {
@@ -53,16 +58,43 @@ int base_filesystem_create(const char *root) {
         int r;
 
         fd = open(root, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
-        if (fd < 0)
+        if (fd < 0) {
+                log_error("Failed to open root file system: %m");
                 return -errno;
+        }
 
         for (i = 0; i < ELEMENTSOF(table); i ++) {
+                if (faccessat(fd, table[i].dir, F_OK, AT_SYMLINK_NOFOLLOW) >= 0)
+                        continue;
+
                 if (table[i].target) {
-                        /* check if target exists */
-                        if (faccessat(fd, table[i].target, F_OK, AT_SYMLINK_NOFOLLOW) < 0)
+                        const char *target = NULL, *s;
+
+                        /* check if one of the targets exists */
+                        NULSTR_FOREACH(s, table[i].target) {
+                                if (faccessat(fd, s, F_OK, AT_SYMLINK_NOFOLLOW) < 0)
+                                        continue;
+
+                                /* check if a specific file exists at the target path */
+                                if (table[i].exists) {
+                                        _cleanup_free_ char *p = NULL;
+
+                                        p = strjoin(s, "/", table[i].exists, NULL);
+                                        if (!p)
+                                                return log_oom();
+
+                                        if (faccessat(fd, p, F_OK, AT_SYMLINK_NOFOLLOW) < 0)
+                                                continue;
+                                }
+
+                                target = s;
+                                break;
+                        }
+
+                        if (!target)
                                 continue;
 
-                        r = symlinkat(table[i].target, fd, table[i].dir);
+                        r = symlinkat(target, fd, table[i].dir);
                         if (r < 0 && errno != EEXIST) {
                                 log_error("Failed to create symlink at %s/%s: %m", root, table[i].dir);
                                 return -errno;