X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=initd%2Fearly.c;h=434351602ff8a292251d973e90ee06e44117ba1b;hp=c622aece14c74c6a082e526bf26b3fc854f2cb58;hb=08cd2c661ea6ce378ce7a6ff37d11220d65e2c5f;hpb=566ca65a3b2c35de811dbd895e2c024e250c6b28

diff --git a/initd/early.c b/initd/early.c
index c622aec..4343516 100644
--- a/initd/early.c
+++ b/initd/early.c
@@ -21,27 +21,8 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include "../log.h"
 #include "init.h"
-
-static void
-early_mounts(void)
-{
-	mount("proc", "/proc", "proc", MS_NOATIME, 0);
-	mount("sysfs", "/sys", "sysfs", MS_NOATIME, 0);
-	mount("none", "/sys/fs/cgroup", "cgroup", 0, 0);
-
-	mount("tmpfs", "/tmp", "tmpfs", MS_NOSUID | MS_NODEV | MS_NOATIME, NULL);
-	mkdir("/tmp/run", 0777);
-	mkdir("/tmp/lock", 0777);
-	mkdir("/tmp/state", 0777);
-	symlink("/tmp", "/var");
-
-	mount("tmpfs", "/dev", "tmpfs", MS_NOATIME, "mode=0755,size=512K");
-	mkdir("/dev/shm", 0755);
-	mkdir("/dev/pts", 0755);
-	mount("devpts", "/dev/pts", "devpts", MS_NOATIME, "mode=600");
-}
+#include "../libc-compat.h"
 
 static void
 early_dev(void)
@@ -78,9 +59,38 @@ early_console(const char *dev)
 }
 
 static void
+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();
+
+	early_console("/dev/console");
+	if (mount_zram_on_tmp()) {
+		mount("tmpfs", "/tmp", "tmpfs", MS_NOSUID | MS_NODEV | MS_NOATIME, 0);
+		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);
+	umask(oldumask);
+}
+
+static void
 early_env(void)
 {
-	setenv("PATH", "/bin:/sbin:/usr/bin:/usr/sbin", 1);
+	setenv("PATH", EARLY_PATH, 1);
 }
 
 void
@@ -90,9 +100,7 @@ early(void)
 		return;
 
 	early_mounts();
-	early_dev();
 	early_env();
-	early_console("/dev/console");
 
 	LOG("Console is alive\n");
 }