Gentoo Archives: gentoo-commits

From: Mike Pagano <mpagano@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/linux-patches:3.14 commit in: /
Date: Sat, 28 Mar 2015 20:25:16
Message-Id: 1427574304.c47577f94a4e4bb61a4ca6b5e1c0cc760e40151e.mpagano@gentoo
1 commit: c47577f94a4e4bb61a4ca6b5e1c0cc760e40151e
2 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 28 20:25:04 2015 +0000
4 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 28 20:25:04 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=c47577f9
7
8 Add check to saved_root_name for supported filesystem path naming.
9
10 2900_dev-root-proc-mount-fix.patch | 10 +++++-----
11 1 file changed, 5 insertions(+), 5 deletions(-)
12
13 diff --git a/2900_dev-root-proc-mount-fix.patch b/2900_dev-root-proc-mount-fix.patch
14 index 4c89adf..67580b7 100644
15 --- a/2900_dev-root-proc-mount-fix.patch
16 +++ b/2900_dev-root-proc-mount-fix.patch
17 @@ -1,6 +1,6 @@
18 ---- a/init/do_mounts.c 2013-01-25 19:11:11.609802424 -0500
19 -+++ b/init/do_mounts.c 2013-01-25 19:14:20.606053568 -0500
20 -@@ -461,7 +461,10 @@ void __init change_floppy(char *fmt, ...
21 +--- a/init/do_mounts.c 2015-03-28 16:08:15.851838057 -0400
22 ++++ b/init/do_mounts.c 2015-03-28 16:24:22.041828843 -0400
23 +@@ -484,7 +484,10 @@ void __init change_floppy(char *fmt, ...
24 va_start(args, fmt);
25 vsprintf(buf, fmt, args);
26 va_end(args);
27 @@ -12,12 +12,12 @@
28 if (fd >= 0) {
29 sys_ioctl(fd, FDEJECT, 0);
30 sys_close(fd);
31 -@@ -505,7 +508,13 @@ void __init mount_root(void)
32 +@@ -528,7 +531,13 @@ void __init mount_root(void)
33 #endif
34 #ifdef CONFIG_BLOCK
35 create_dev("/dev/root", ROOT_DEV);
36 - mount_block_root("/dev/root", root_mountflags);
37 -+ if (saved_root_name[0]) {
38 ++ if (saved_root_name[0] == '/') {
39 + create_dev(saved_root_name, ROOT_DEV);
40 + mount_block_root(saved_root_name, root_mountflags);
41 + } else {