summaryrefslogtreecommitdiffstats
path: root/init/do_mounts_initrd.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2018-10-23 16:00:10 +0200
committerDominik Brodowski <linux@dominikbrodowski.net>2019-12-12 18:58:24 +0100
commitb49a733d684e0096340b93e9dfd471f0e3ddc06d (patch)
tree0ad59f513c9ca4af672a9e683935ce6c27a6289b /init/do_mounts_initrd.c
parentinit: use do_mount() instead of ksys_mount() (diff)
downloadlinux-b49a733d684e0096340b93e9dfd471f0e3ddc06d.tar.xz
linux-b49a733d684e0096340b93e9dfd471f0e3ddc06d.zip
init: unify opening /dev/console as stdin/stdout/stderr
Merge the two instances where /dev/console is opened as stdin/stdout/stderr. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'init/do_mounts_initrd.c')
-rw-r--r--init/do_mounts_initrd.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index 3bf7b74153ab..dab8b1151b56 100644
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -48,10 +48,7 @@ early_param("initrd", early_initrd);
static int init_linuxrc(struct subprocess_info *info, struct cred *new)
{
ksys_unshare(CLONE_FS | CLONE_FILES);
- /* stdin/stdout/stderr for /linuxrc */
- ksys_open("/dev/console", O_RDWR, 0);
- ksys_dup(0);
- ksys_dup(0);
+ console_on_rootfs();
/* move initrd over / and chdir/chroot in initrd root */
ksys_chdir("/root");
do_mount(".", "/", NULL, MS_MOVE, NULL);