1 |
commit: eb0a44de4e660928fbf347dae020a3b6cde29d7b |
2 |
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 26 12:16:43 2014 +0000 |
4 |
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 26 12:16:43 2014 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/linux-patches.git;a=commit;h=eb0a44de |
7 |
|
8 |
Update to correct double mount thanks to mgorny |
9 |
|
10 |
--- |
11 |
2900_dev-root-proc-mount-fix.patch | 11 ++++++----- |
12 |
1 file changed, 6 insertions(+), 5 deletions(-) |
13 |
|
14 |
diff --git a/2900_dev-root-proc-mount-fix.patch b/2900_dev-root-proc-mount-fix.patch |
15 |
index 4c89adf..6ea86e2 100644 |
16 |
--- a/2900_dev-root-proc-mount-fix.patch |
17 |
+++ b/2900_dev-root-proc-mount-fix.patch |
18 |
@@ -1,6 +1,6 @@ |
19 |
---- a/init/do_mounts.c 2013-01-25 19:11:11.609802424 -0500 |
20 |
-+++ b/init/do_mounts.c 2013-01-25 19:14:20.606053568 -0500 |
21 |
-@@ -461,7 +461,10 @@ void __init change_floppy(char *fmt, ... |
22 |
+--- a/init/do_mounts.c 2014-08-26 08:03:30.000013100 -0400 |
23 |
++++ b/init/do_mounts.c 2014-08-26 08:11:19.720014712 -0400 |
24 |
+@@ -484,7 +484,10 @@ void __init change_floppy(char *fmt, ... |
25 |
va_start(args, fmt); |
26 |
vsprintf(buf, fmt, args); |
27 |
va_end(args); |
28 |
@@ -12,10 +12,11 @@ |
29 |
if (fd >= 0) { |
30 |
sys_ioctl(fd, FDEJECT, 0); |
31 |
sys_close(fd); |
32 |
-@@ -505,7 +508,13 @@ void __init mount_root(void) |
33 |
+@@ -527,8 +530,13 @@ void __init mount_root(void) |
34 |
+ } |
35 |
#endif |
36 |
#ifdef CONFIG_BLOCK |
37 |
- create_dev("/dev/root", ROOT_DEV); |
38 |
+- create_dev("/dev/root", ROOT_DEV); |
39 |
- mount_block_root("/dev/root", root_mountflags); |
40 |
+ if (saved_root_name[0]) { |
41 |
+ create_dev(saved_root_name, ROOT_DEV); |