Merge branch 'for-2.6.30' into for-2.6.31

[sfrench/cifs-2.6.git] / init / initramfs.c

diff --git a/init/initramfs.c b/init/initramfs.c
index 619c1baf7701e8b6c8b42f07ca3f3521f4b5b97d..80cd713f6cc5cc8b3f09317534acebdf4983903a 100644 (file)
--- a/init/initramfs.c
+++ b/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,