2 files changed, 22 insertions, 1 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 7e9fbd48e2ab..9afb971497f4 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1280,6 +1280,22 @@ source "usr/Kconfig"
 
 endif
 
+config INIT_FALLBACK
+        bool "Fall back to defaults if init= parameter is bad"
+        default y
+        help
+          If enabled, the kernel will try the default init binaries if an
+          explicit request from the init= parameter fails.
+
+          This can have unexpected effects.  For example, booting
+          with init=/sbin/kiosk_app will run /sbin/init or even /bin/sh
+          if /sbin/kiosk_app cannot be executed.
+
+          The default value of Y is consistent with historical behavior.
+          Selecting N is likely to be more appropriate for most uses,
+          especially on kiosks and on kernels that are intended to be
+          run under the control of a script.
+
 config CC_OPTIMIZE_FOR_SIZE
         bool "Optimize for size"
         help
diff --git a/init/main.c b/init/main.c
index d2e4ead4891f..ca380ec685de 100644
--- a/init/main.c
+++ b/init/main.c
@@ -952,8 +952,13 @@ static int __ref kernel_init(void *unused)
                 ret = run_init_process(execute_command);
                 if (!ret)
                         return 0;
+#ifndef CONFIG_INIT_FALLBACK
+                panic("Requested init %s failed (error %d).",
+                      execute_command, ret);
+#else
                 pr_err("Failed to execute %s (error %d).  Attempting defaults...\n",
-                        execute_command, ret);
+                       execute_command, ret);
+#endif
         }
         if (!try_to_run_init_process("/sbin/init") ||
             !try_to_run_init_process("/etc/init") ||