summaryrefslogtreecommitdiffstats
path: root/init/do_mounts_initrd.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-07-14 01:11:44 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-07-14 01:11:44 +0200
commit08cd84c81f27d5bd22ba958b7cae6d566c509280 (patch)
tree6fdb546c151410851fd3c604d42590afa4215084 /init/do_mounts_initrd.c
parentMerge /spare/repo/netdev-2.6 branch 'ieee80211' (diff)
parentMerge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6. (diff)
downloadlinux-08cd84c81f27d5bd22ba958b7cae6d566c509280.tar.xz
linux-08cd84c81f27d5bd22ba958b7cae6d566c509280.zip
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
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 ... ");