hashmap: allow hashmap_move() to fail

[elogind.git] / src / shared / base-filesystem.c

diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
index 682155bb4538335b7e96be4a6d279d0bf13ec6bf..4c65a495d3596a6732b0499ad0739aeee57322fa 100644 (file)
--- a/src/shared/base-filesystem.c
+++ b/src/shared/base-filesystem.c
@@ -38,16 +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" },
+        { "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\0usr/lib64" },
+        { "lib64",    0, "usr/lib/x86_64-linux-gnu\0"
+                         "usr/lib64\0",                "ld-linux-x86-64.so.2" },
 #endif
-        { "root",  0755, NULL },
-        { "sbin",     0, "usr/sbin" },
 };
 
 int base_filesystem_create(const char *root) {
@@ -56,19 +58,35 @@ 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) {
-                        const char *target = NULL;
-                        const char *s;
+                        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;
                         }