---

yaml --- r: 139633 b: refs/heads/master c: c1c490e h: refs/heads/master i: 139631: a60d8f8 v: v3
git-mirror · Apr 3, 2009 · 83bf433 · 83bf433
1 parent 5b24822
commit 83bf433
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -571,19 +571,20 @@ 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 {
 			clean_rootfs();
 			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,