X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=initd%2Fearly.c;h=e87774f31cd0d44cc99e1ba123044f0ddf98b371;hb=f35fa23a126505a726a9f09be01cd351a08e2532;hp=77ced772beee03082dd68a324bd8a95d3fa7d849;hpb=916f95cb58604038695347ee41a430d8ca1f0556;p=project%2Fprocd.git

diff --git a/initd/early.c b/initd/early.c
index 77ced77..e87774f 100644
--- a/initd/early.c
+++ b/initd/early.c
@@ -21,26 +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("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)
@@ -72,6 +54,37 @@ early_console(const char *dev)
 	    dd != STDOUT_FILENO &&
 	    dd != STDERR_FILENO)
 		close(dd);
+
+	fcntl(STDERR_FILENO, F_SETFL, fcntl(STDERR_FILENO, F_GETFL) | O_NONBLOCK);
+}
+
+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
@@ -87,9 +100,7 @@ early(void)
 		return;
 
 	early_mounts();
-	early_dev();
 	early_env();
-	early_console("/dev/console");
 
 	LOG("Console is alive\n");
 }