From 83bf4339e985c39a6ac3f01a2c0fd667b5085d91 Mon Sep 17 00:00:00 2001 From: Simon Kitching Date: Thu, 2 Apr 2009 16:57:00 -0700 Subject: [PATCH] --- yaml --- r: 139633 b: refs/heads/master c: c1c490e017b66b31f6559db9cbb51a3ce00cf639 h: refs/heads/master i: 139631: a60d8f85f0a3461dc694a3d12338ca7a1d072a6d v: v3 --- [refs] | 2 +- trunk/init/initramfs.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index cf5b92ed6b6c..349588caafc5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f2c55b843836d26528c56a0968689accaedbc67 +refs/heads/master: c1c490e017b66b31f6559db9cbb51a3ce00cf639 diff --git a/trunk/init/initramfs.c b/trunk/init/initramfs.c index 619c1baf7701..80cd713f6cc5 100644 --- a/trunk/init/initramfs.c +++ b/trunk/init/initramfs.c @@ -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,