public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

init: unify opening /dev/console as stdin/stdout/stderr

Browse source 
Merge the two instances where /dev/console is opened as
stdin/stdout/stderr.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
Dominik Brodowski 2018-10-23 16:00:10 +02:00
parent cccaa5e335
commit b49a733d68
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/linux/initrd.h
View file

@ -28,3 +28,5 @@ extern unsigned int real_root_dev;
extern char __initramfs_start[]; extern char __initramfs_start[];
extern unsigned long __initramfs_size; extern unsigned long __initramfs_size;
void console_on_rootfs(void);

5
init/do_mounts_initrd.c
View file

@ -48,10 +48,7 @@ early_param("initrd", early_initrd);
static int init_linuxrc(struct subprocess_info *info, struct cred *new) static int init_linuxrc(struct subprocess_info *info, struct cred *new)
{ {
ksys_unshare(CLONE_FS | CLONE_FILES); ksys_unshare(CLONE_FS | CLONE_FILES);
/* stdin/stdout/stderr for /linuxrc */ console_on_rootfs();
ksys_open("/dev/console", O_RDWR, 0);
ksys_dup(0);
ksys_dup(0);
/* move initrd over / and chdir/chroot in initrd root */ /* move initrd over / and chdir/chroot in initrd root */
ksys_chdir("/root"); ksys_chdir("/root");
do_mount(".", "/", NULL, MS_MOVE, NULL); do_mount(".", "/", NULL, MS_MOVE, NULL);

17
init/main.c
View file

@ -1155,6 +1155,17 @@ static int __ref kernel_init(void *unused)
"See Linux Documentation/admin-guide/init.rst for guidance."); "See Linux Documentation/admin-guide/init.rst for guidance.");
} }
void console_on_rootfs(void)
{
/* Open the /dev/console as stdin, this should never fail */
if (ksys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
pr_err("Warning: unable to open an initial console.\n");
/* create stdout/stderr */
(void) ksys_dup(0);
(void) ksys_dup(0);
}
static noinline void __init kernel_init_freeable(void) static noinline void __init kernel_init_freeable(void)
{ {
/* /*
@ -1190,12 +1201,8 @@ static noinline void __init kernel_init_freeable(void)
do_basic_setup(); do_basic_setup();
/* Open the /dev/console on the rootfs, this should never fail */ console_on_rootfs();
if (ksys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
pr_err("Warning: unable to open an initial console.\n");
(void) ksys_dup(0);
(void) ksys_dup(0);
/* /*
* check if there is an early userspace init. If yes, let it do all * check if there is an early userspace init. If yes, let it do all
* the work * the work