Automatic merge with /usr/src/ntfs-2.6.git.

1 files changed, 4 insertions, 1 deletions

diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index 4def882d0b..a05cabd0fd 100644
--- a/init/do_mounts_initrd.c
+++ b/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 ... ");