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
Change of vterm handling logic on backend chardev input event (#40)
[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 5aebfcbdffe6673ffbdaa92c767095594d5efa5f..47fcf68e0ae7739e4cc73ea97dfaeb2b6773f700 100644
(file)
--- a/
lunaix-os/usr/init/init.c
+++ b/
lunaix-os/usr/init/init.c
@@
-36,16
+36,21
@@
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)
{
int
main(int argc, const char** argv)
{
-
mkdir("/dev");
mkdir("/sys");
mkdir("/task");
mkdir("/dev");
mkdir("/sys");
mkdir("/task");
@@
-65,7
+70,9
@@
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);
}
@@
-73,8
+80,10
@@
main(int argc, const char** argv)
waitpid(pid, &err, 0);
if (WEXITSTATUS(err)) {
waitpid(pid, &err, 0);
if (WEXITSTATUS(err)) {
- printf("shell exit abnormally (%d)", err);
+ printf("shell exit abnormally (%d)
\n
", err);
}
}
+ printf("init exiting\n");
+
return err;
}
\ No newline at end of file
return err;
}
\ No newline at end of file