| 1 |
commit: bb36852c647b9905eaff367fe8792a6a00d54838 |
| 2 |
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 28 19:54:57 2015 +0000 |
| 4 |
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 28 19:54:57 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=bb36852c |
| 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 6ea86e2..aa6fa19 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 2014-08-26 08:03:30.000013100 -0400 |
| 19 |
-+++ b/init/do_mounts.c 2014-08-26 08:11:19.720014712 -0400 |
| 20 |
-@@ -484,7 +484,10 @@ void __init change_floppy(char *fmt, ... |
| 21 |
+--- a/init/do_mounts.c 2015-03-28 15:38:01.750855358 -0400 |
| 22 |
++++ b/init/do_mounts.c 2015-03-28 15:41:47.873853202 -0400 |
| 23 |
+@@ -485,7 +485,10 @@ void __init change_floppy(char *fmt, ... |
| 24 |
va_start(args, fmt); |
| 25 |
vsprintf(buf, fmt, args); |
| 26 |
va_end(args); |
| 27 |
@@ -12,13 +12,13 @@ |
| 28 |
if (fd >= 0) { |
| 29 |
sys_ioctl(fd, FDEJECT, 0); |
| 30 |
sys_close(fd); |
| 31 |
-@@ -527,8 +530,13 @@ void __init mount_root(void) |
| 32 |
+@@ -528,8 +531,13 @@ void __init mount_root(void) |
| 33 |
} |
| 34 |
#endif |
| 35 |
#ifdef CONFIG_BLOCK |
| 36 |
- create_dev("/dev/root", ROOT_DEV); |
| 37 |
- mount_block_root("/dev/root", root_mountflags); |
| 38 |
-+ if (saved_root_name[0]) { |
| 39 |
++ if (saved_root_name[0] == '/') { |
| 40 |
+ create_dev(saved_root_name, ROOT_DEV); |
| 41 |
+ mount_block_root(saved_root_name, root_mountflags); |
| 42 |
+ } else { |
Archives