summaryrefslogtreecommitdiffstats
path: root/init/do_mounts_initrd.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-07-13 22:23:51 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-07-13 22:23:51 +0200
commit327309e899662b482c58cf25f574513d38b5788c (patch)
tree069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /init/do_mounts_initrd.c
parentMerge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6. (diff)
parentLinux 2.6.13-rc3 (diff)
downloadlinux-327309e899662b482c58cf25f574513d38b5788c.tar.xz
linux-327309e899662b482c58cf25f574513d38b5788c.zip
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
Diffstat (limited to 'init/do_mounts_initrd.c')
-rw-r--r--init/do_mounts_initrd.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index 4def882d0b31..a05cabd0fd10 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 ... ");