Merge branch 'for-5.11-null-console' into for-linus

This commit is contained in:
Petr Mladek
2020-12-14 15:14:57 +01:00
6 changed files with 38 additions and 19 deletions

View File

@@ -1480,8 +1480,14 @@ void __init console_on_rootfs(void)
struct file *file = filp_open("/dev/console", O_RDWR, 0);
if (IS_ERR(file)) {
pr_err("Warning: unable to open an initial console.\n");
return;
pr_err("Warning: unable to open an initial console. Fallback to ttynull.\n");
register_ttynull_console();
file = filp_open("/dev/console", O_RDWR, 0);
if (IS_ERR(file)) {
pr_err("Warning: Failed to add ttynull console. No stdin, stdout, and stderr for the init process!\n");
return;
}
}
init_dup(file);
init_dup(file);