X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/28c176b668c841a3b7fb093faccf0efa39257603..270869139db617e29a35bb9ded41087bb702f9ac:/lunaix-os/usr/init/init.c diff --git a/lunaix-os/usr/init/init.c b/lunaix-os/usr/init/init.c index 2416e07..c402a4f 100644 --- a/lunaix-os/usr/init/init.c +++ b/lunaix-os/usr/init/init.c @@ -15,6 +15,14 @@ } \ } 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; \ @@ -36,6 +44,9 @@ init_termios(int fd) { 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)); @@ -51,10 +62,12 @@ 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)); @@ -67,8 +80,6 @@ main(int argc, const char** argv) pid_t pid; int err = 0; if (!(pid = fork())) { - - err = execve(sh_argv[0], sh_argv, sh_envp); printf("fail to execute (%d)\n", errno); _exit(err);