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

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

Dominik Brodowski committed 8 years ago

Commit b49a7331 parent cccaa5e3 files · +15 −9Browse files

Unified · Split

3 files

@@ -28,3 +28,5 @@ extern unsigned int real_root_dev; · 27 unmodified lines
28		28
29	extern char __initramfs_start[];	29	extern char __initramfs_start[];
30	extern unsigned long __initramfs_size;	30	extern unsigned long __initramfs_size;
		31
		32	void console_on_rootfs(void);

 static int init_linuxrc(struct subprocess_info *info, struct cred *new)
 {
 	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 */
 	ksys_chdir("/root");
 	do_mount(".", "/", NULL, MS_MOVE, NULL);

 	      "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)
 {
 	/*
 	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
 	 * the work

Keyboard shortcuts