From e65aec12ae1d224aa2b7743fd5d5d10c586227ac Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 4 Sep 2012 16:32:43 -0700 Subject: [PATCH] nspawn: mount a clean instance of sysfs --- src/nspawn/nspawn.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 40b99343d..a8c8b7caf 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); -- 2.30.2