[patch 2.6.12] Improper initrd failure message at boot time

[Jay Lan <jlan@engr.sgi.com>]

[-- Attachment #1: Type: text/plain, Size: 715 bytes --]

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>

[-- Attachment #2: handle_initrd-2.6.12 --]
[-- Type: text/plain, Size: 662 bytes --]

Index: linux/init/do_mounts_initrd.c
===================================================================
--- linux.orig/init/do_mounts_initrd.c	2005-06-17 12:48:29.000000000 -0700
+++ linux/init/do_mounts_initrd.c	2005-06-29 16:48:21.512229871 -0700
@@ -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 ... ");