Second Extended Filesystem (ext2) and other improvements (#33)

[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 45bbf929de7fbafcc082ccd86fad4eabf6fdaecb..c402a4f1a1864abc6d7bdb43d79f385aeea1a136 100644 (file)
--- a/lunaix-os/usr/init/init.c
+++ b/lunaix-os/usr/init/init.c
@@ -15,6 +15,14 @@
         }                                                                      \
     } while (0)
 
         }                                                                      \
     } while (0)
 

+#define maybe_mount(src, target, fs, opts)                                      \
+    do {                                                                       \
+        int err = 0;                                                           \
+        if ((err = mount(src, target, fs, opts))) {                            \
+            syslog(2, "mount fs %s to %s failed (%d)\n", fs, target, errno);   \
+        }                                                                      \
+    } while (0)
+

 #define check(statement)                                                       \
     ({                                                                         \
         int err = 0;                                                           \
 #define check(statement)                                                       \
     ({                                                                         \
         int err = 0;                                                           \


@@ -36,22 +44,30 @@ init_termios(int fd) {
     term.c_oflag = ONLCR | OPOST;
     term.c_cflag = CREAD | CLOCAL | CS8 | CPARENB;
     term.c_cc[VERASE] = 0x7f;
     term.c_oflag = ONLCR | OPOST;
     term.c_cflag = CREAD | CLOCAL | CS8 | CPARENB;
     term.c_cc[VERASE] = 0x7f;

+    
+    cfsetispeed(&term, B9600);
+    cfsetospeed(&term, B9600);

 
     check(tcsetattr(fd, 0, &term));
 
     return 0;
 }
 
 
     check(tcsetattr(fd, 0, &term));
 
     return 0;
 }
 

+const char* sh_argv[] = { "/usr/bin/sh", 0  };
+const char* sh_envp[] = {  0  };
+

 int
 main(int argc, const char** argv)
 {
     mkdir("/dev");
     mkdir("/sys");
     mkdir("/task");
 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);
 
     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));
 
 
     int fd = check(open("/dev/tty", 0));
 


@@ -64,7 +80,7 @@ main(int argc, const char** argv)
     pid_t pid;
     int err = 0;
     if (!(pid = fork())) {
     pid_t pid;
     int err = 0;
     if (!(pid = fork())) {

-        err = execve("/usr/bin/sh", NULL, NULL);
+        err = execve(sh_argv[0], sh_argv, sh_envp);

         printf("fail to execute (%d)\n", errno);
         _exit(err);
     }
         printf("fail to execute (%d)\n", errno);
         _exit(err);
     }