procd: clean up /dev/pts mounts

[project/procd.git] / initd / early.c

diff --git a/initd/early.c b/initd/early.c
index 00fd9467912085fcba2b2abab2163e49b025009e..4b7e61c6da92a26971d77a270069d9aae8164e8f 100644 (file)
--- a/initd/early.c
+++ b/initd/early.c
@@ -25,6 +25,7 @@
 #include "../utils/utils.h"
 #include "init.h"
 #include "../libc-compat.h"
+#include "../container.h"
 
 static void
 early_dev(void)
@@ -56,18 +57,21 @@ early_mounts(void)
 {
        unsigned int oldumask = umask(0);
 
-       mount("proc", "/proc", "proc", MS_NOATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID, 0);
-       mount("sysfs", "/sys", "sysfs", MS_NOATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID, 0);
-       mount("cgroup", "/sys/fs/cgroup", "cgroup",  MS_NODEV | MS_NOEXEC | MS_NOSUID, 0);
-       mount("tmpfs", "/dev", "tmpfs", MS_NOATIME | MS_NOSUID, "mode=0755,size=512K");
-       ignore(symlink("/tmp/shm", "/dev/shm"));
-       mkdir("/dev/pts", 0755);
-       mount("devpts", "/dev/pts", "devpts", MS_NOATIME | MS_NOEXEC | MS_NOSUID, "mode=600");
-       early_dev();
+       if (!is_container()) {
+               mount("proc", "/proc", "proc", MS_NOATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID, 0);
+               mount("sysfs", "/sys", "sysfs", MS_NOATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID, 0);
+               mount("cgroup2", "/sys/fs/cgroup", "cgroup2",  MS_NODEV | MS_NOEXEC | MS_NOSUID | MS_RELATIME, "nsdelegate");
+               mount("tmpfs", "/dev", "tmpfs", MS_NOATIME | MS_NOEXEC | MS_NOSUID, "mode=0755,size=512K");
+               ignore(symlink("/tmp/shm", "/dev/shm"));
+               mkdir("/dev/pts", 0755);
+               mount("devpts", "/dev/pts", "devpts", MS_NOATIME | MS_NOEXEC | MS_NOSUID, 0);
+
+               early_dev();
+       }
 
        early_console("/dev/console");
        if (mount_zram_on_tmp()) {
-               mount("tmpfs", "/tmp", "tmpfs", MS_NOSUID | MS_NODEV | MS_NOATIME, 0);
+               mount("tmpfs", "/tmp", "tmpfs", MS_NOSUID | MS_NODEV | MS_NOATIME, "mode=01777");
                mkdir("/tmp/shm", 01777);
        } else {
                mkdir("/tmp/shm", 01777);