jail: remove accidentally added lines

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

diff --git a/initd/early.c b/initd/early.c
index accfc1dce54c488e5cb4ab82eb9922c76b7c8a89..7b281b20b8233785de957d6b0dba23338e916e45 100644 (file)
--- a/initd/early.c
+++ b/initd/early.c
@@ -15,6 +15,7 @@
 #include <sys/mount.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/sysmacros.h>
 
 #include <stdio.h>
 #include <fcntl.h>
@@ -24,6 +25,7 @@
 #include "../utils/utils.h"
 #include "init.h"
 #include "../libc-compat.h"
+#include "../container.h"
 
 static void
 early_dev(void)
@@ -38,7 +40,7 @@ early_console(const char *dev)
        struct stat s;
 
        if (stat(dev, &s)) {
-               ERROR("Failed to stat %s\n", dev);
+               ERROR("Failed to stat %s: %m\n", dev);
                return;
        }
 
@@ -55,27 +57,30 @@ 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("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();
+       }
 
        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);
                mount("tmpfs", "/tmp/shm", "tmpfs", MS_NOSUID | MS_NODEV | MS_NOATIME,
                                "mode=01777");
        }
-       mkdir("/tmp/run", 0777);
-       mkdir("/tmp/lock", 0777);
-       mkdir("/tmp/state", 0777);
+       mkdir("/tmp/run", 0755);
+       mkdir("/tmp/lock", 0755);
+       mkdir("/tmp/state", 0755);
        umask(oldumask);
 }