Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1c490e0 authored by Simon Kitching's avatar Simon Kitching Committed by Linus Torvalds
Browse files

initramfs: prevent initramfs printk message being split by messages from other code. 



initramfs uses printk without a linefeed, then does some work, then uses
printk to finish the message off.  However if some other code does a
printk in between, then the messages get mixed together.  Better for each
message to be an independent line...

Example of problem that this fixes:

    checking if image is initramfs...<7>Switched to high resolution mode on CPU 1
    Switched to high resolution mode on CPU 0
    it is

Signed-off-by: default avatarSimon Kitching <skitching@apache.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6f2c55b8

init/initramfs.c

+4 −3
Original line number Diff line number Diff line
@@ -571,11 +571,11 @@ static int __init populate_rootfs(void) 
	if (initrd_start) {

#ifdef CONFIG_BLK_DEV_RAM

		int fd;

		printk(KERN_INFO "checking if image is initramfs...");

		printk(KERN_INFO "checking if image is initramfs...\n");

		err = unpack_to_rootfs((char *)initrd_start,

			initrd_end - initrd_start);

		if (!err) {

			printk(" it is\n");

			printk(KERN_INFO "rootfs image is initramfs; unpacking...\n");

			free_initrd();

			return 0;

		} else {
@@ -583,7 +583,8 @@ static int __init populate_rootfs(void) 
			unpack_to_rootfs(__initramfs_start,

				 __initramfs_end - __initramfs_start);

		}

		printk("it isn't (%s); looks like an initrd\n", err);

		printk(KERN_INFO "rootfs image is not initramfs (%s)"

				"; looks like an initrd\n", err);

		fd = sys_open("/initrd.image", O_WRONLY|O_CREAT, 0700);

		if (fd >= 0) {

			sys_write(fd, (char *)initrd_start,