X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=initd%2Fearly.c;h=7028ff8a4b79e0d5f29573d29855a21b8cae1bf8;hb=520ad3c71507d76738a4afa14fc51dbe57275606;hp=5821c58f20aa8b3822cbd89809069c476612be39;hpb=45cb04fd85d788a37367a5385e5e90dd98a0a991;p=project%2Fprocd.git

diff --git a/initd/early.c b/initd/early.c
index 5821c58..7028ff8 100644
--- a/initd/early.c
+++ b/initd/early.c
@@ -15,12 +15,14 @@
 #include <sys/mount.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/sysmacros.h>
 
 #include <stdio.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 
+#include "../utils/utils.h"
 #include "init.h"
 #include "../libc-compat.h"
 
@@ -35,25 +37,16 @@ static void
 early_console(const char *dev)
 {
 	struct stat s;
-	int dd;
 
 	if (stat(dev, &s)) {
 		ERROR("Failed to stat %s\n", dev);
 		return;
 	}
 
-	dd = open(dev, O_RDWR);
-	if (dd < 0)
-		dd = open("/dev/null", O_RDWR);
-
-	dup2(dd, STDIN_FILENO);
-	dup2(dd, STDOUT_FILENO);
-	dup2(dd, STDERR_FILENO);
-
-	if (dd != STDIN_FILENO &&
-	    dd != STDOUT_FILENO &&
-	    dd != STDERR_FILENO)
-		close(dd);
+	if (patch_stdio(dev)) {
+		ERROR("Failed to setup i/o redirection\n");
+		return;
+	}
 
 	fcntl(STDERR_FILENO, F_SETFL, fcntl(STDERR_FILENO, F_GETFL) | O_NONBLOCK);
 }
@@ -81,16 +74,16 @@ early_mounts(void)
 		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);
 }
 
 static void
 early_env(void)
 {
-	setenv("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1);
+	setenv("PATH", EARLY_PATH, 1);
 }
 
 void