From 3eb23a59f07b4c7b30dbac11c02c3649b17cc48c Mon Sep 17 00:00:00 2001
From: Jay Lan <jlan@engr.sgi.com>
Date: Thu, 30 Jun 2005 02:59:03 -0700
Subject: [PATCH] --- yaml --- r: 4005 b: refs/heads/master c:
 f220ab2a5162c35cca6993ea473937cfc962fce4 h: refs/heads/master i:   4003:
 a2da33d405baf88e246a23ed1b3fa5447547b104 v: v3

---
 [refs]                        | 2 +-
 trunk/init/do_mounts_initrd.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9458a899d9e8..4282e4b77e9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c71e22e4e4b4e7261f147635518d5634136c226
+refs/heads/master: f220ab2a5162c35cca6993ea473937cfc962fce4
diff --git a/trunk/init/do_mounts_initrd.c b/trunk/init/do_mounts_initrd.c
index 4def882d0b31..a05cabd0fd10 100644
--- a/trunk/init/do_mounts_initrd.c
+++ b/trunk/init/do_mounts_initrd.c
@@ -86,7 +86,10 @@ static void __init handle_initrd(void)
 		printk("okay\n");
 	else {
 		int fd = sys_open("/dev/root.old", O_RDWR, 0);
-		printk("failed\n");
+		if (error == -ENOENT)
+			printk("/initrd does not exist. Ignored.\n");
+		else
+			printk("failed\n");
 		printk(KERN_NOTICE "Unmounting old root\n");
 		sys_umount("/old", MNT_DETACH);
 		printk(KERN_NOTICE "Trying to free ramdisk memory ... ");