[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>

authored by Jay Lan and committed by Linus Torvalds f220ab2a 1c71e22e

+4 -1
+4 -1
init/do_mounts_initrd.c
··· 86 86 printk("okay\n"); 87 87 else { 88 88 int fd = sys_open("/dev/root.old", O_RDWR, 0); 89 - printk("failed\n"); 89 + if (error == -ENOENT) 90 + printk("/initrd does not exist. Ignored.\n"); 91 + else 92 + printk("failed\n"); 90 93 printk(KERN_NOTICE "Unmounting old root\n"); 91 94 sys_umount("/old", MNT_DETACH); 92 95 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");