git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 e9f8a405d07894479be8acbed12d7f43a9205c09..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,14
+26,14
@@
main(int argc, const char** argv)
pid_t pid;
if (!(pid = fork())) {
pid_t pid;
if (!(pid = fork())) {
- err = execve("/usr/bin/s
ignal_demo
", NULL, NULL);
+ err = execve("/usr/bin/s
h
", NULL, NULL);
printf("fail to execute (%d)\n", errno);
_exit(err);
}
waitpid(pid, &err, 0);
printf("fail to execute (%d)\n", errno);
_exit(err);
}
waitpid(pid, &err, 0);
- if (
err
) {
+ if (
WEXITSTATUS(err)
) {
printf("shell exit abnormally (%d)", err);
}
printf("shell exit abnormally (%d)", err);
}