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

Commit a1e6b6c1 authored by Eric Piel's avatar Eric Piel Committed by Linus Torvalds
Browse files

initramfs: clean up messages related to initramfs unpacking 



With the removal of duplicate unpack_to_rootfs() (commit
df52092f) the messages displayed do not
actually correspond to what the kernel is doing.  In addition, depending
if ramdisks are supported or not, the messages are not at all the same.

So keep the messages more in sync with what is really doing the kernel,
and only display a second message in case of failure.  This also ensure
that the printk message cannot be split by other printk's.

Signed-off-by: default avatarEric Piel <eric.piel@tremplin-utc.net>
Acked-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fc4d5c29

init/initramfs.c

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

#ifdef CONFIG_BLK_DEV_RAM

		int fd;

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

		printk(KERN_INFO "Trying to unpack rootfs image as initramfs...\n");

		err = unpack_to_rootfs((char *)initrd_start,

			initrd_end - initrd_start);

		if (!err) {

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

			free_initrd();

			return 0;

		} else {
@@ -596,15 +595,11 @@ static int __init populate_rootfs(void) 
			free_initrd();

		}

#else

		printk(KERN_INFO "Unpacking initramfs...");

		printk(KERN_INFO "Unpacking initramfs...\n");

		err = unpack_to_rootfs((char *)initrd_start,

			initrd_end - initrd_start);

		if (err) {

			printk(" failed!\n");

			printk(KERN_EMERG "%s\n", err);

		} else {

			printk(" done\n");

		}

		if (err)

			printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);

		free_initrd();

#endif

	}