X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=mount-setup.c;h=a804030df00242050ba62cafdef3ba6533a400e2;hp=a1bcb9afad6d3c7fd5f22b9fc0bfb3b367363977;hb=8d567588cad053f79abe603ab113e1b85a92f1da;hpb=ca714c0e55008cceda013ab876ccdd4640d863ae

diff --git a/mount-setup.c b/mount-setup.c
index a1bcb9afa..a804030df 100644
--- a/mount-setup.c
+++ b/mount-setup.c
@@ -38,16 +38,17 @@ typedef struct MountPoint {
         const char *type;
         const char *options;
         unsigned long flags;
+        bool fatal;
 } MountPoint;
 
 static const MountPoint mount_table[] = {
-        { "proc",    "/proc",             "proc",     NULL,        MS_NOSUID|MS_NOEXEC|MS_NODEV },
-        { "sysfs",   "/sys",              "sysfs",    NULL,        MS_NOSUID|MS_NOEXEC|MS_NODEV },
-        { "devtmps", "/dev",              "devtmpfs", "mode=755",  MS_NOSUID },
-        { "tmpfs",   "/dev/shm",          "tmpfs",    "mode=1777", MS_NOSUID|MS_NOEXEC|MS_NODEV },
-        { "devpts",  "/dev/pts",          "devpts",   NULL,        MS_NOSUID|MS_NOEXEC|MS_NODEV },
-        { "cgroup",  "/cgroup/debug",     "cgroup",   "debug",     MS_NOSUID|MS_NOEXEC|MS_NODEV },
-        { "debugfs", "/sys/kernel/debug", "debugfs",  NULL,        MS_NOSUID|MS_NOEXEC|MS_NODEV }
+        { "proc",    "/proc",             "proc",     NULL,        MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
+        { "sysfs",   "/sys",              "sysfs",    NULL,        MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
+        { "devtmps", "/dev",              "devtmpfs", "mode=755",  MS_NOSUID,                    true },
+        { "tmpfs",   "/dev/shm",          "tmpfs",    "mode=1777", MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
+        { "devpts",  "/dev/pts",          "devpts",   NULL,        MS_NOSUID|MS_NOEXEC|MS_NODEV, false },
+        { "cgroup",  "/cgroup/debug",     "cgroup",   "debug",     MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
+        { "debugfs", "/sys/kernel/debug", "debugfs",  NULL,        MS_NOSUID|MS_NOEXEC|MS_NODEV, false }
 };
 
 bool mount_point_is_api(const char *path) {
@@ -63,37 +64,12 @@ bool mount_point_is_api(const char *path) {
         return false;
 }
 
-static int is_mount_point(const char *t) {
-        struct stat a, b;
-        char *copy;
-
-        if (lstat(t, &a) < 0) {
-
-                if (errno == ENOENT)
-                        return 0;
-
-                return -errno;
-        }
-
-        if (!(copy = strdup(t)))
-                return -ENOMEM;
-
-        if (lstat(dirname(copy), &b) < 0) {
-                free(copy);
-                return -errno;
-        }
-
-        free(copy);
-
-        return a.st_dev != b.st_dev;
-}
-
 static int mount_one(const MountPoint *p) {
         int r;
 
         assert(p);
 
-        if ((r = is_mount_point(p->where)) < 0)
+        if ((r = path_is_mount_point(p->where)) < 0)
                 return r;
 
         if (r > 0)
@@ -115,12 +91,69 @@ static int mount_one(const MountPoint *p) {
                   p->flags,
                   p->options) < 0) {
                 log_error("Failed to mount %s: %s", p->where, strerror(errno));
-                return -errno;
+                return p->fatal ? -errno : 0;
         }
 
         return 0;
 }
 
+static int mount_cgroup_controllers(void) {
+        int r;
+        FILE *f;
+        char buf [256];
+
+        /* Mount all available cgroup controllers. */
+
+        if (!(f = fopen("/proc/cgroups", "re")))
+                return -ENOENT;
+
+        /* Ignore the header line */
+        fgets(buf, sizeof(buf), f);
+
+        for (;;) {
+                MountPoint p;
+                char *controller, *where;
+
+                if (fscanf(f, "%ms %*i %*i %*i", &controller) != 1) {
+
+                        if (feof(f))
+                                break;
+
+                        log_error("Failed to parse /proc/cgroups.");
+                        r = -EIO;
+                        goto finish;
+                }
+
+                if (asprintf(&where, "/cgroup/%s", controller) < 0) {
+                        free(controller);
+                        r = -ENOMEM;
+                        goto finish;
+                }
+
+                zero(p);
+                p.what = "cgroup";
+                p.where = where;
+                p.type = "cgroup";
+                p.options = controller;
+                p.flags = MS_NOSUID|MS_NOEXEC|MS_NODEV;
+                p.fatal = false;
+
+                r = mount_one(&p);
+                free(controller);
+                free(where);
+
+                if (r < 0)
+                        goto finish;
+        }
+
+        r = 0;
+
+finish:
+        fclose(f);
+
+        return r;
+}
+
 int mount_setup(void) {
         int r;
         unsigned i;
@@ -129,5 +162,5 @@ int mount_setup(void) {
                 if ((r = mount_one(mount_table+i)) < 0)
                         return r;
 
-        return 0;
+        return mount_cgroup_controllers();
 }