| developer | c67a50d | 2023-02-21 13:39:07 +0800 | [diff] [blame^] | 1 | Index: linux-5.4.224/init/do_mounts.c |
| 2 | =================================================================== |
| 3 | --- linux-5.4.224.orig/init/do_mounts.c |
| 4 | +++ linux-5.4.224/init/do_mounts.c |
| 5 | @@ -576,7 +576,8 @@ void __init mount_root(void) |
| 6 | } |
| 7 | #endif |
| 8 | #ifdef CONFIG_MTD_ROOTFS_ROOT_DEV |
| 9 | - if (!mount_ubi_rootfs()) |
| 10 | + extern bool dual_boot; |
| 11 | + if (!dual_boot && !mount_ubi_rootfs()) |
| 12 | return; |
| 13 | #endif |
| 14 | #ifdef CONFIG_BLOCK |
| 15 | Index: linux-5.4.224/kernel/boot_param.c |
| 16 | =================================================================== |
| 17 | --- linux-5.4.224.orig/kernel/boot_param.c |
| 18 | +++ linux-5.4.224/kernel/boot_param.c |
| 19 | @@ -10,7 +10,7 @@ |
| 20 | |
| 21 | #define BOOT_PARAM_STR_MAX_LEN 256 |
| 22 | |
| 23 | -static bool dual_boot; |
| 24 | +bool dual_boot; |
| 25 | module_param(dual_boot, bool, 0444); |
| 26 | |
| 27 | static bool no_split_rootfs_data; |