]> err.no Git - linux-2.6/commitdiff
[PATCH] Add warning `init=' to init/main.c
authorAvery, Brian <b.avery@hp.com>
Tue, 6 Sep 2005 22:16:56 +0000 (15:16 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 7 Sep 2005 23:57:23 +0000 (16:57 -0700)
I passed init=/mylinuxrc to the kernel on the command line.  The kernel
silently dropped down to exec /sbin/init.  It turned out that /mylinuxrc
had improper permissions.  Without any warning message from the kernel that
something was wrong it took awhile to find the issue.  The patch below adds
a warning.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
init/main.c

index a29fb2ac724076433bf729b1f8c77a23aa673206..e4dbcbcd26cfe81903f47285096cd059390ab065 100644 (file)
@@ -708,10 +708,11 @@ static int init(void * unused)
         * The Bourne shell can be used instead of init if we are 
         * trying to recover a really broken machine.
         */
-
-       if (execute_command)
+       if (execute_command) {
                run_init_process(execute_command);
-
+               printk(KERN_WARNING "Failed to execute %s.  Attempting "
+                                       "defaults...\n", execute_command);
+       }
        run_init_process("/sbin/init");
        run_init_process("/etc/init");
        run_init_process("/bin/init");