diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-07-13 22:50:59 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-07-13 22:50:59 +0200 |
| commit | 576a01c873a79e9183292d434ec0b18af8cd36cf (patch) | |
| tree | 207705e6ecf79fd2249a7ddf8e19e5ee7a555522 | |
| parent | 4e2d4c08fc1a154597a3a696056fcdbe54659963 (diff) | |
nspawn: compress mount table a bit
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | src/nspawn.c | 20 |
2 files changed, 12 insertions, 10 deletions
@@ -20,6 +20,8 @@ F15 External: Features: +* warn if the user stops a service but not its associated socket + * logind: spawn user@..service on login * logind: implement shutdown service diff --git a/src/nspawn.c b/src/nspawn.c index 8ee940c2be..8f3cd749e5 100644 --- a/src/nspawn.c +++ b/src/nspawn.c @@ -124,17 +124,17 @@ static int mount_all(const char *dest) { } MountPoint; static const MountPoint mount_table[] = { - { "/proc", "/proc", "bind", NULL, MS_BIND, true }, - { "/proc/sys", "/proc/sys", "bind", NULL, MS_BIND, true }, /* Bind mount first */ - { "/proc/sys", "/proc/sys", "bind", NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, true }, /* Then, make it r/o */ - { "/sys", "/sys", "bind", NULL, MS_BIND, true }, /* Bind mount first */ - { "/sys", "/sys", "bind", NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, true }, /* Then, make it r/o */ - { "tmpfs", "/dev", "tmpfs", "mode=755", MS_NOSUID, true }, - { "/dev/pts", "/dev/pts", "bind", NULL, MS_BIND, true }, - { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV, true }, + { "/proc", "/proc", "bind", NULL, MS_BIND, true }, + { "/proc/sys", "/proc/sys", "bind", NULL, MS_BIND, true }, /* Bind mount first */ + { "/proc/sys", "/proc/sys", "bind", NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, true }, /* Then, make it r/o */ + { "/sys", "/sys", "bind", NULL, MS_BIND, true }, /* Bind mount first */ + { "/sys", "/sys", "bind", NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, true }, /* Then, make it r/o */ + { "tmpfs", "/dev", "tmpfs", "mode=755", MS_NOSUID, true }, + { "/dev/pts", "/dev/pts", "bind", NULL, MS_BIND, true }, + { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV, true }, #ifdef HAVE_SELINUX - { "/selinux", "/selinux", "bind", NULL, MS_BIND, false }, /* Bind mount first */ - { "/selinux", "/selinux", "selinuxfs", NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, false }, /* Then, make it r/o */ + { "/selinux", "/selinux", "bind", NULL, MS_BIND, false }, /* Bind mount first */ + { "/selinux", "/selinux", "bind", NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, false }, /* Then, make it r/o */ #endif }; |