generic: 6.6: manually refresh pending patches

[openwrt/staging/981213.git] / target / linux / generic / pending-6.6 / 492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch

diff --git a/target/linux/generic/pending-6.6/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/target/linux/generic/pending-6.6/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
index f95ec46f14eb5b046104981e5e207d618d4a6b9f..b63b333c478c81c491e2a4af7ec1403cc8d33d07 100644 (file)
--- a/target/linux/generic/pending-6.6/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
+++ b/target/linux/generic/pending-6.6/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
@@ -40,14 +40,15 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  #ifdef CONFIG_ROOT_NFS
  
  #define NFSROOT_TIMEOUT_MIN   5
-@@ -579,6 +602,10 @@ void __init mount_root(void)
-               return;
-       }
- #endif
+@@ -408,6 +408,11 @@ void __init mount_root(void)
+ 
+ void __init mount_root(char *root_device_name)
+ {
 +#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
 +      if (!mount_ubi_rootfs())
 +              return;
 +#endif
-       if (ROOT_DEV == 0 && root_device_name && root_fs_names) {
-               if (mount_nodev_root() == 0)
-                       return;
++
+       switch (ROOT_DEV) {
+       case Root_NFS:
+               mount_nfs_root();