KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kernel: fix missing break in ubi auto-mounting patch

Browse source 
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Hauke Mehrtens 2016-06-21 22:07:04 +02:00 committed by John Crispin
parent 459a8afff1
commit dc140e00a9
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
target/linux/generic/patches-3.18/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
View file

@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -433,7 +433,27 @@ retry:
@@ -433,7 +433,28 @@ retry:
out:
put_page(page);
}
@ -29,6 +29,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+ case -EACCES:
+ flags |= MS_RDONLY;
+ tried++;
+ break;
+ default:
+ return err;
+ }

3
target/linux/generic/patches-4.1/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
View file

@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -438,7 +438,27 @@ retry:
@@ -438,7 +438,28 @@ retry:
out:
put_page(page);
}
@ -29,6 +29,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+ case -EACCES:
+ flags |= MS_RDONLY;
+ tried++;
+ break;
+ default:
+ return err;
+ }

5
target/linux/generic/patches-4.4/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
View file

@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -438,7 +438,27 @@ retry:
@@ -438,7 +438,28 @@ retry:
out:
put_page(page);
}
@ -29,6 +29,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+ case -EACCES:
+ flags |= MS_RDONLY;
+ tried++;
+ break;
+ default:
+ return err;
+ }
@ -40,7 +41,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
#ifdef CONFIG_ROOT_NFS
#define NFSROOT_TIMEOUT_MIN 5
@@ -532,6 +552,10 @@ void __init mount_root(void)
@@ -532,6 +553,10 @@ void __init mount_root(void)
change_floppy("root floppy");
}
#endif