init: reduce delay after starting kmodloader

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

diff --git a/initd/early.c b/initd/early.c
index 89c8104..4343516 100644 (file)
--- a/initd/early.c
+++ b/initd/early.c
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 
 #include "init.h"
+#include "../libc-compat.h"
 
 static void
 early_dev(void)
@@ -62,18 +63,18 @@ early_mounts(void)
 {
        unsigned int oldumask = umask(0);
 
-       mount("proc", "/proc", "proc", MS_NOATIME, 0);
-       mount("sysfs", "/sys", "sysfs", MS_NOATIME, 0);
-       mount("none", "/sys/fs/cgroup", "cgroup", 0, 0);
-       mount("tmpfs", "/dev", "tmpfs", MS_NOATIME, "mode=0755,size=512K");
-       symlink("/tmp/shm", "/dev/shm");
+       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, "mode=600");
+       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, NULL);
+               mount("tmpfs", "/tmp", "tmpfs", MS_NOSUID | MS_NODEV | MS_NOATIME, 0);
                mkdir("/tmp/shm", 01777);
        } else {
                mkdir("/tmp/shm", 01777);
@@ -89,7 +90,7 @@ early_mounts(void)
 static void
 early_env(void)
 {
-       setenv("PATH", "/bin:/sbin:/usr/bin:/usr/sbin", 1);
+       setenv("PATH", EARLY_PATH, 1);
 }
 
 void