[systemd-commits] 3 commits - src/nspawn src/shared

[Lennart Poettering]

 src/nspawn/nspawn.c    |    8 +++++---
 src/shared/path-util.c |   36 +++++++++++++++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 4 deletions(-)

New commits:
commit 1640a0b6b05b8ae01abbe5939f86f17a61e7998f
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Sep 4 16:37:57 2012 -0700

    path-util: in path_is_mount_point() fall back to the classic stat() test if fs does not support name_to_handle_at()

diff --git a/src/shared/path-util.c b/src/shared/path-util.c
index 4cb0b03..2dddc8f 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -335,6 +335,7 @@ int path_is_mount_point(const char *t, bool allow_symlink) {
         int r;
         struct file_handle *h;
         int mount_id, mount_id_parent;
+        struct stat a, b;
 
         /* We are not actually interested in the file handles, but
          * name_to_handle_at() also passes us the mount ID, hence use
@@ -348,6 +349,12 @@ int path_is_mount_point(const char *t, bool allow_symlink) {
 
         r = name_to_handle_at(AT_FDCWD, t, h, &mount_id, allow_symlink ? AT_SYMLINK_FOLLOW : 0);
         if (r < 0) {
+                if (errno == ENOTSUP)
+                        /* This file system does not support
+                         * name_to_handle_at(), hence fallback to the
+                         * traditional stat() logic */
+                        goto fallback;
+
                 if (errno == ENOENT)
                         return 0;
 
@@ -362,11 +369,38 @@ int path_is_mount_point(const char *t, bool allow_symlink) {
         r = name_to_handle_at(AT_FDCWD, parent, h, &mount_id_parent, 0);
         free(parent);
 
+        if (r < 0) {
+                /* The parent can't do name_to_handle_at() but the
+                 * directory we are interested in can? If so, it must
+                 * be a mount point */
+                if (errno == ENOTSUP)
+                        return 1;
+
+                return -errno;
+        }
+
+        return mount_id != mount_id_parent;
+
+fallback:
+        if (allow_symlink)
+                r = stat(t, &a);
+        else
+                r = lstat(t, &b);
+
         if (r < 0)
                 return -errno;
 
+        r = path_get_parent(t, &parent);
+        if (r < 0)
+                return r;
 
-        return mount_id != mount_id_parent;
+        r = lstat(parent, &b);
+        free(parent);
+
+        if (r < 0)
+                return -errno;
+
+        return a.st_dev != b.st_dev;
 }
 
 int path_is_read_only_fs(const char *path) {

commit 014a9c777b97b9df432f71537e289b2723795412
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Sep 4 16:33:13 2012 -0700

    nspawn: skip mounts if already mounted

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index a8c8b7c..4aa877d 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -306,6 +306,9 @@ static int mount_all(const char *dest) {
                         continue;
                 }
 
+                if (t > 0)
+                        continue;
+
                 mkdir_p_label(where, 0755);
 
                 if (mount(mount_table[k].what,

commit e65aec12ae1d224aa2b7743fd5d5d10c586227ac
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Sep 4 16:32:43 2012 -0700

    nspawn: mount a clean instance of sysfs

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 40b9934..a8c8b7c 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -269,8 +269,7 @@ static int mount_all(const char *dest) {
                 { "proc",      "/proc",     "proc",  NULL,       MS_NOSUID|MS_NOEXEC|MS_NODEV, true  },
                 { "/proc/sys", "/proc/sys", NULL,    NULL,       MS_BIND, true                       },   /* Bind mount first */
                 { NULL,        "/proc/sys", NULL,    NULL,       MS_BIND|MS_RDONLY|MS_REMOUNT, true  },   /* Then, make it r/o */
-                { "/sys",      "/sys",      NULL,    NULL,       MS_BIND,                      true  },   /* Bind mount first */
-                { NULL,        "/sys",      NULL,    NULL,       MS_BIND|MS_RDONLY|MS_REMOUNT, true  },   /* Then, make it r/o */
+                { "sysfs",     "/sys",      "sysfs", NULL,       MS_RDONLY|MS_NOSUID|MS_NOEXEC|MS_NODEV, true  },
                 { "tmpfs",     "/dev",      "tmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME,     true  },
                 { "/dev/pts",  "/dev/pts",  NULL,    NULL,       MS_BIND,                      true  },
                 { "tmpfs",     "/run",      "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true  },
@@ -296,7 +295,7 @@ static int mount_all(const char *dest) {
                         break;
                 }
 
-                t = path_is_mount_point(where, false);
+                t = path_is_mount_point(where, true);
                 if (t < 0) {
                         log_error("Failed to detect whether %s is a mount point: %s", where, strerror(-t));
                         free(where);