commit:     f6c3a6c5c3db66d698c0aa726dac52387ac1c8d4
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 28 19:46:03 2015 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 19:46:03 2015 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=f6c3a6c5

Add check to saved_root_name for supported filesystem path naming.

 2900_dev-root-proc-mount-fix.patch | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/2900_dev-root-proc-mount-fix.patch 
b/2900_dev-root-proc-mount-fix.patch
index 6ea86e2..aa6fa19 100644
--- a/2900_dev-root-proc-mount-fix.patch
+++ b/2900_dev-root-proc-mount-fix.patch
@@ -1,6 +1,6 @@
---- a/init/do_mounts.c 2014-08-26 08:03:30.000013100 -0400
-+++ b/init/do_mounts.c 2014-08-26 08:11:19.720014712 -0400
-@@ -484,7 +484,10 @@ void __init change_floppy(char *fmt, ...
+--- a/init/do_mounts.c 2015-03-28 15:38:01.750855358 -0400
++++ b/init/do_mounts.c 2015-03-28 15:41:47.873853202 -0400
+@@ -485,7 +485,10 @@ void __init change_floppy(char *fmt, ...
        va_start(args, fmt);
        vsprintf(buf, fmt, args);
        va_end(args);
@@ -12,13 +12,13 @@
        if (fd >= 0) {
                sys_ioctl(fd, FDEJECT, 0);
                sys_close(fd);
-@@ -527,8 +530,13 @@ void __init mount_root(void)
+@@ -528,8 +531,13 @@ void __init mount_root(void)
        }
  #endif
  #ifdef CONFIG_BLOCK
 -      create_dev("/dev/root", ROOT_DEV);
 -      mount_block_root("/dev/root", root_mountflags);
-+      if (saved_root_name[0]) {
++      if (saved_root_name[0] == '/') {
 +              create_dev(saved_root_name, ROOT_DEV);
 +              mount_block_root(saved_root_name, root_mountflags);
 +      } else {

Reply via email to