Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszere...

[deliverable/linux.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 1354ac09b5163a097ea8e0ca3146716cdc051363..058e3671fa11ecab043f414946ae539b8fadf2ec 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1287,22 +1287,6 @@ 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