feat: standard vga support (mode switching, framebuffer remapping)

[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 7e1785a4948f985740f6de49ae832c16464fa95d..7f7ca5e95fcc39d9b8239cde1c76f64b59d31543 100644 (file)
--- a/lunaix-os/usr/init/init.c
+++ b/lunaix-os/usr/init/init.c
@@ -19,8 +19,6 @@ main(int argc, const char** argv)
         return 0;
     }
 
         return 0;
     }
 

-    printf("(%p) user space!\n", (void*)main);
-

     if ((err = symlink("/usr", "/mnt/lunaix-os/usr"))) {
         syslog(2, "symlink /usr:/mnt/lunaix-os/usr (%d)\n", errno);
         return 0;
     if ((err = symlink("/usr", "/mnt/lunaix-os/usr"))) {
         syslog(2, "symlink /usr:/mnt/lunaix-os/usr (%d)\n", errno);
         return 0;


@@ -28,12 +26,16 @@ main(int argc, const char** argv)
 
     pid_t pid;
     if (!(pid = fork())) {
 
     pid_t pid;
     if (!(pid = fork())) {

-        err = execve("/usr/sh", NULL, NULL);
+        err = execve("/usr/bin/sh", NULL, NULL);

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

-    waitpid(pid, NULL, 0);
+    waitpid(pid, &err, 0);
+
+    if (WEXITSTATUS(err)) {
+        printf("shell exit abnormally (%d)", err);
+    }

 
     return 0;
 }
\ No newline at end of file
 
     return 0;
 }
\ No newline at end of file