diff options
Diffstat (limited to 'sys/kern/init_main.c')
-rw-r--r-- | sys/kern/init_main.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index aa78e8d..667bb97 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -54,10 +54,9 @@ copyright(void) static void start_init(void) { -#if 0 struct proc *td = this_td(); struct execve_args execve_args; - char *argv[] = { "/usr/sbin/init", NULL }; + char *argv[] = { "/usr/bin/osh", NULL }; char *envp[] = { NULL }; execve_args.pathname = argv[0]; @@ -65,8 +64,8 @@ start_init(void) execve_args.envp = envp; if (execve(td, &execve_args) != 0) panic("failed to load init\n"); -#endif - for (;;); + + __builtin_unreachable(); } int @@ -75,15 +74,15 @@ main(void) /* Setup serial driver */ serial_init(); + /* Init the virtual memory subsystem */ + vm_init(); + /* Startup the console */ cons_init(); copyright(); kprintf("Starting Hyra/%s v%s: %s\n", HYRA_ARCH, HYRA_VERSION, HYRA_BUILDDATE); - /* Init the virtual memory subsystem */ - vm_init(); - /* Start the ACPI subsystem */ acpi_init(); |