diff options
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 7 |
1 files changed, 6 insertions, 1 deletions
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) | |||
952 | ret = run_init_process(execute_command); | 952 | ret = run_init_process(execute_command); |
953 | if (!ret) | 953 | if (!ret) |
954 | return 0; | 954 | return 0; |
955 | #ifndef CONFIG_INIT_FALLBACK | ||
956 | panic("Requested init %s failed (error %d).", | ||
957 | execute_command, ret); | ||
958 | #else | ||
955 | pr_err("Failed to execute %s (error %d). Attempting defaults...\n", | 959 | pr_err("Failed to execute %s (error %d). Attempting defaults...\n", |
956 | execute_command, ret); | 960 | execute_command, ret); |
961 | #endif | ||
957 | } | 962 | } |
958 | if (!try_to_run_init_process("/sbin/init") || | 963 | if (!try_to_run_init_process("/sbin/init") || |
959 | !try_to_run_init_process("/etc/init") || | 964 | !try_to_run_init_process("/etc/init") || |