Skip to content

Commit 5125991

Browse files
amlutotorvalds
authored andcommitted
init: remove CONFIG_INIT_FALLBACK
CONFIG_INIT_FALLBACK adds config bloat without an obvious use case that makes it worth keeping around. Delete it. Signed-off-by: Andy Lutomirski <[email protected]> Cc: Rusty Russell <[email protected]> Cc: Chuck Ebbert <[email protected]> Cc: Frank Rowand <[email protected]> Reviewed-by: Josh Triplett <[email protected]> Cc: Randy Dunlap <[email protected]> Cc: Rob Landley <[email protected]> Cc: Shuah Khan <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent bebf56a commit 5125991

File tree

2 files changed

+0
-21
lines changed

2 files changed

+0
-21
lines changed

init/Kconfig

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1287,22 +1287,6 @@ source "usr/Kconfig"
12871287

12881288
endif
12891289

1290-
config INIT_FALLBACK
1291-
bool "Fall back to defaults if init= parameter is bad"
1292-
default y
1293-
help
1294-
If enabled, the kernel will try the default init binaries if an
1295-
explicit request from the init= parameter fails.
1296-
1297-
This can have unexpected effects. For example, booting
1298-
with init=/sbin/kiosk_app will run /sbin/init or even /bin/sh
1299-
if /sbin/kiosk_app cannot be executed.
1300-
1301-
The default value of Y is consistent with historical behavior.
1302-
Selecting N is likely to be more appropriate for most uses,
1303-
especially on kiosks and on kernels that are intended to be
1304-
run under the control of a script.
1305-
13061290
config CC_OPTIMIZE_FOR_SIZE
13071291
bool "Optimize for size"
13081292
help

init/main.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -953,13 +953,8 @@ static int __ref kernel_init(void *unused)
953953
ret = run_init_process(execute_command);
954954
if (!ret)
955955
return 0;
956-
#ifndef CONFIG_INIT_FALLBACK
957956
panic("Requested init %s failed (error %d).",
958957
execute_command, ret);
959-
#else
960-
pr_err("Failed to execute %s (error %d). Attempting defaults...\n",
961-
execute_command, ret);
962-
#endif
963958
}
964959
if (!try_to_run_init_process("/sbin/init") ||
965960
!try_to_run_init_process("/etc/init") ||

0 commit comments

Comments
 (0)