Framework for exporting system header to user space (#59)

[lunaix-os.git] / lunaix-os / usr / init / init.c

diff --git a/lunaix-os/usr/init/init.c b/lunaix-os/usr/init/init.c
index c402a4f1a1864abc6d7bdb43d79f385aeea1a136..67a73f995835e71442612ce38f7f63fcc721f058 100644 (file)
--- a/lunaix-os/usr/init/init.c
+++ b/lunaix-os/usr/init/init.c
@@ -1,11 +1,13 @@
 #include <errno.h>
 #include <fcntl.h>
-#include <lunaix/lunaix.h>
-#include <lunaix/mount.h>
+#include <sys/wait.h>
+#include <sys/mount.h>
 #include <termios.h>
 #include <stdio.h>
 #include <unistd.h>
 
+#include <sys/lunaix.h>
+
 #define must_mount(src, target, fs, opts)                                      \
     do {                                                                       \
         int err = 0;                                                           \
@@ -39,7 +41,7 @@ init_termios(int fd) {
 
     check(tcgetattr(fd, &term));
 
-    term.c_lflag = ICANON | IEXTEN | ISIG | ECHO | ECHOE | ECHONL;
+    term.c_lflag = ICANON | IEXTEN | ISIG | ECHO | ECHOE;
     term.c_iflag = ICRNL | IGNBRK;
     term.c_oflag = ONLCR | OPOST;
     term.c_cflag = CREAD | CLOCAL | CS8 | CPARENB;
@@ -53,21 +55,15 @@ init_termios(int fd) {
     return 0;
 }
 
-const char* sh_argv[] = { "/usr/bin/sh", 0  };
+const char* sh_argv[] = { "/bin/sh", 0  };
 const char* sh_envp[] = {  0  };
 
 int
 main(int argc, const char** argv)
 {
-    mkdir("/dev");
-    mkdir("/sys");
-    mkdir("/task");
-    mkdir("/mnt/disk");
-
     must_mount(NULL, "/dev", "devfs", 0);
     must_mount(NULL, "/sys", "twifs", MNT_RO);
     must_mount(NULL, "/task", "taskfs", MNT_RO);
-    maybe_mount("/dev/block/sdb", "/mnt/disk", "ext2", 0);
 
     int fd = check(open("/dev/tty", 0));
 
@@ -75,8 +71,6 @@ main(int argc, const char** argv)
 
     check(dup(fd));
 
-    check(symlink("/usr", "/mnt/lunaix-os/usr"));
-
     pid_t pid;
     int err = 0;
     if (!(pid = fork())) {