diff options
| author | Jay Lan <jlan@engr.sgi.com> | 2005-06-30 13:59:03 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-30 19:45:12 +0400 |
| commit | f220ab2a5162c35cca6993ea473937cfc962fce4 (patch) | |
| tree | 4d9d1a199625d8b657a69d9afeed17c0dbb02a10 /init | |
| parent | 1c71e22e4e4b4e7261f147635518d5634136c226 (diff) | |
| download | linux-f220ab2a5162c35cca6993ea473937cfc962fce4.tar.xz | |
[PATCH] Improper initrd failure message at boot time
On system boot up, there was an failure reported to boot.msg:
<5>Trying to move old root to /initrd ... failed
According to initrd(4) man page, step #7 of BOOT-UP OPERATION
is described as below:
7. If the normal root file has directory /initrd, device
/dev/ram0 is moved from / to /initrd. Otherwise if
directory /initrd does not exist device /dev/ram0 is
unmounted.
We got service calls from customers concerning about this failure message
at boot time. Many systems do not have /initrd and thus the message can be
changed in the case of non-existing /initrd so that it does not sound like
a failure of the system.
Signed-off-by: Jay Lan <jlan@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/do_mounts_initrd.c | 5 |
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 ... "); |