aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.19/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2015-01-25 15:20:39 +0000
committerImre Kaloz <kaloz@openwrt.org>2015-01-25 15:20:39 +0000
commiteac842c52b28a4fd42082f3ca8231f5874a57361 (patch)
tree514eb8ba16df65dd4b3feeb3c900279596556d09 /target/linux/generic/patches-3.19/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
parent10c00d28433d42305ead73480465ce87d047a3d2 (diff)
downloadupstream-eac842c52b28a4fd42082f3ca8231f5874a57361.tar.gz
upstream-eac842c52b28a4fd42082f3ca8231f5874a57361.tar.bz2
upstream-eac842c52b28a4fd42082f3ca8231f5874a57361.zip
generic: add preliminary 3.19 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44126 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.19/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch')
-rw-r--r--target/linux/generic/patches-3.19/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch53
1 files changed, 53 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.19/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/target/linux/generic/patches-3.19/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
new file mode 100644
index 0000000000..406737e9cc
--- /dev/null
+++ b/target/linux/generic/patches-3.19/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
@@ -0,0 +1,53 @@
+From eea9e1785e4c05c2a3444506aabafa0ae958538f Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Sat, 17 May 2014 03:35:02 +0200
+Subject: [PATCH 4/5] try auto-mounting ubi0:rootfs in init/do_mounts.c
+To: openwrt-devel@lists.openwrt.org
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+---
+ init/do_mounts.c | 26 +++++++++++++++++++++++++-
+ 1 file changed, 25 insertions(+), 1 deletion(-)
+
+--- a/init/do_mounts.c
++++ b/init/do_mounts.c
+@@ -435,7 +435,27 @@ retry:
+ out:
+ put_page(page);
+ }
+-
++
++static int __init mount_ubi_rootfs(void)
++{
++ int flags = MS_SILENT;
++ int err, tried = 0;
++
++ while (tried < 2) {
++ err = do_mount_root("ubi0:rootfs", "ubifs", flags, \
++ root_mount_data);
++ switch (err) {
++ case -EACCES:
++ flags |= MS_RDONLY;
++ tried++;
++ default:
++ return err;
++ }
++ }
++
++ return -EINVAL;
++}
++
+ #ifdef CONFIG_ROOT_NFS
+
+ #define NFSROOT_TIMEOUT_MIN 5
+@@ -529,6 +549,10 @@ void __init mount_root(void)
+ change_floppy("root floppy");
+ }
+ #endif
++#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
++ if (!mount_ubi_rootfs())
++ return;
++#endif
+ #ifdef CONFIG_BLOCK
+ create_dev("/dev/root", ROOT_DEV);
+ mount_block_root("/dev/root", root_mountflags);