--- uClinux-dist/linux-2.4.20.x/init/main.c 2008-05-04 23:38:32.000000000 +1000 +++ uClinux-dist/linux-2.4.x/init/main.c 2003-02-27 13:26:39.000000000 +1000 @@ -359,23 +359,14 @@ * enable them */ lock_kernel(); - - //printk(linux_banner); - + printk(linux_banner); setup_arch(&command_line); - - //printk("Kernel command line: %s\n", saved_command_line); - + printk("Kernel command line: %s\n", saved_command_line); parse_options(command_line); - trap_init(); - init_IRQ(); - sched_init(); - softirq_init(); - time_init(); /* @@ -384,7 +375,6 @@ * this. But we do want output early, in case something goes wrong. */ console_init(); - #ifdef CONFIG_MODULES init_modules(); #endif @@ -400,9 +390,7 @@ kmem_cache_init(); sti(); - calibrate_delay(); - #ifdef CONFIG_BLK_DEV_INITRD if (initrd_start && !initrd_below_start_ok && initrd_start < min_low_pfn << PAGE_SHIFT) { @@ -559,8 +547,6 @@ static int init(void * unused) { -static char * argv_sh[MAX_INIT_ARGS+2] = { "/bin/sh", "-t","/bin/inittab",NULL, }; -static char * argv_busybox[MAX_INIT_ARGS+2] = { "/bin/busybox", "lash", "/bin/inittab",NULL, }; lock_kernel(); do_basic_setup(); @@ -572,33 +558,14 @@ * initmem segments and start the user-mode stuff.. */ free_initmem(); - unlock_kernel(); - - printk("open console, start shell...\n"); -/* -#ifndef CONFIG_VDD + if (open("/dev/console", O_RDWR, 0) < 0) printk("Warning: unable to open an initial console.\n"); -#else - if (open("/dev/vdd0", O_RDWR, 0) < 0) - a printk("Warning: unable to open an initial console.\n"); -#endif -*/ - //06Mar2005, lie, use /dev/null as the console. - /* - if (open("/dev/ttyS1", O_RDWR, 0) < 0) - printk("Warning: unable to open null file!\n"); - - (void) dup(0); (void) dup(0); - */ - // - //startup our own main process. - // - execve("/bin/s1901", argv_init, envp_init); + /* * We try each of these until one succeeds. * @@ -611,8 +578,6 @@ execve("/sbin/init",argv_init,envp_init); execve("/etc/init",argv_init,envp_init); execve("/bin/init",argv_init,envp_init); - execve("/bin/busybox",argv_busybox,envp_init); - execve("/bin/sh",argv_sh,envp_init); - execve("/bin/sh.exe",argv_sh,envp_init); + execve("/bin/sh",argv_init,envp_init); panic("No init found. Try passing init= option to kernel."); }