hostname-setup: add SuSE compatiblity

[elogind.git] / mount-setup.c

diff --git a/mount-setup.c b/mount-setup.c
index 18d3911be45e9c8f7db174beccfaf6710b427691..8cb77669f36740a359011daa6c031b894d81b8a5 100644 (file)
--- a/mount-setup.c
+++ b/mount-setup.c
@@ -29,6 +29,8 @@
 
 #include "mount-setup.h"
 #include "log.h"
+#include "macro.h"
+#include "util.h"
 
 enum {
         MOUNT_WHAT,
@@ -46,9 +48,21 @@ static const char *table[] = {
         "devpts",  "/dev/pts",          "devpts",   NULL,
         "cgroup",  "/cgroup/debug",     "cgroup",   "debug",
         "debugfs", "/sys/kernel/debug", "debugfs",  NULL,
-        NULL
 };
 
+bool mount_point_is_api(const char *path) {
+        unsigned i;
+
+        /* Checks if this mount point is considered "API", and hence
+         * should be ignored */
+
+        for (i = 0; i < ELEMENTSOF(table); i += MOUNT_SKIP)
+                if (path_startswith(path, table[i+MOUNT_WHERE]))
+                        return true;
+
+        return false;
+}
+
 static int is_mount_point(const char *t) {
         struct stat a, b;
         char *copy;
@@ -88,13 +102,13 @@ static int mount_one(const char *t[]) {
 
         /* The access mode here doesn't really matter too much, since
          * the mounted file system will take precedence anyway. */
-        mkdir(t[MOUNT_WHERE], 0755);
+        mkdir_p(t[MOUNT_WHERE], 0755);
 
         log_debug("Mounting %s to %s of type %s with options %s.",
                   t[MOUNT_WHAT],
                   t[MOUNT_WHERE],
                   t[MOUNT_TYPE],
-                  t[MOUNT_OPTIONS]);
+                  strna(t[MOUNT_OPTIONS]));
 
         if (mount(t[MOUNT_WHAT],
                   t[MOUNT_WHERE],
@@ -110,10 +124,10 @@ static int mount_one(const char *t[]) {
 
 int mount_setup(void) {
         int r;
-        const char **t;
+        unsigned i;
 
-        for (t = table; *t; t += MOUNT_SKIP)
-                if ((r = mount_one(t)) < 0)
+        for (i = 0; i < ELEMENTSOF(table); i += MOUNT_SKIP)
+                if ((r = mount_one(table + i)) < 0)
                         return r;
 
         return 0;