aboutsummaryrefslogtreecommitdiffstats
path: root/patches/boot/mount_root-clarify-error-messages-for-when-no-rootfs.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/boot/mount_root-clarify-error-messages-for-when-no-rootfs.patch')
-rw-r--r--patches/boot/mount_root-clarify-error-messages-for-when-no-rootfs.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/patches/boot/mount_root-clarify-error-messages-for-when-no-rootfs.patch b/patches/boot/mount_root-clarify-error-messages-for-when-no-rootfs.patch
index 6e455d05..286993ea 100644
--- a/patches/boot/mount_root-clarify-error-messages-for-when-no-rootfs.patch
+++ b/patches/boot/mount_root-clarify-error-messages-for-when-no-rootfs.patch
@@ -1,4 +1,4 @@
-From f276dd9842f8ecb7d33fb1fd8a1a0386958774c7 Mon Sep 17 00:00:00 2001
+From ca14e0ea8ac29797e9eedfda5456b818a83626e8 Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Thu, 26 Nov 2009 07:32:09 -0800
Subject: [PATCH] mount_root: clarify error messages for when no rootfs found
@@ -25,13 +25,13 @@ Signed-off-by: Darren Hart <dvhart@linux.intel.com>
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/init/do_mounts.c b/init/do_mounts.c
-index 29d326b6c29d..882307e6dd90 100644
+index 5fdef94f0864..73d5b89d0c24 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
-@@ -458,7 +458,9 @@ void __init mount_block_root(char *name, int flags)
- printk("DEBUG_BLOCK_EXT_DEVT is enabled, you need to specify "
- "explicit textual name for \"root=\" boot option.\n");
- #endif
+@@ -231,7 +231,9 @@ void __init mount_root_generic(char *name, char *pretty_name, int flags)
+ pr_err("\n");
+ }
+
- panic("VFS: Unable to mount root fs on %s", b);
+ printk(KERN_EMERG "VFS: Unable to mount root fs on %s\n", b);
+ printk(KERN_EMERG "User configuration error - no valid root filesystem found\n");
@@ -39,17 +39,17 @@ index 29d326b6c29d..882307e6dd90 100644
}
if (!(flags & SB_RDONLY)) {
flags |= SB_RDONLY;
-@@ -471,7 +473,9 @@ void __init mount_block_root(char *name, int flags)
- for (p = fs_names; *p; p += strlen(p)+1)
+@@ -244,7 +246,9 @@ void __init mount_root_generic(char *name, char *pretty_name, int flags)
+ for (i = 0, p = fs_names; i < num_fs; i++, p += strlen(p)+1)
printk(" %s", p);
printk("\n");
-- panic("VFS: Unable to mount root fs on %s", b);
-+ printk(KERN_EMERG "VFS: Unable to mount root fs on %s\n", b);
+- panic("VFS: Unable to mount root fs on \"%s\" or %s", pretty_name, b);
++ printk(KERN_EMERG "VFS: Unable to mount root fs on \"%s\" or %s\n", pretty_name, b);
+ printk(KERN_EMERG "User configuration error - no valid root filesystem found\n");
+ panic("Invalid configuration from end user prevents continuing");
out:
put_page(page);
}
--
-2.19.1
+2.34.1