| developer | 5d148cb | 2023-06-02 13:08:11 +0800 | [diff] [blame] | 1 | From 7be8614176dc79bc242a12b7669f330058e36df6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Sam Shih <sam.shih@mediatek.com> |
| 3 | Date: Fri, 2 Jun 2023 13:06:24 +0800 |
| 4 | Subject: [PATCH] [adv-feature][999-2550-dual-image-mount-rootfs.patch] |
| 5 | |
| 6 | --- |
| 7 | init/do_mounts.c | 3 ++- |
| 8 | kernel/boot_param.c | 2 +- |
| 9 | 2 files changed, 3 insertions(+), 2 deletions(-) |
| 10 | |
| 11 | diff --git a/init/do_mounts.c b/init/do_mounts.c |
| 12 | index cd5fca8aa..2dfc0dac7 100644 |
| 13 | --- a/init/do_mounts.c |
| 14 | +++ b/init/do_mounts.c |
| 15 | @@ -576,7 +576,8 @@ void __init mount_root(void) |
| 16 | } |
| 17 | #endif |
| 18 | #ifdef CONFIG_MTD_ROOTFS_ROOT_DEV |
| 19 | - if (!mount_ubi_rootfs()) |
| 20 | + extern bool dual_boot; |
| 21 | + if (!dual_boot && !mount_ubi_rootfs()) |
| 22 | return; |
| 23 | #endif |
| 24 | #ifdef CONFIG_BLOCK |
| 25 | diff --git a/kernel/boot_param.c b/kernel/boot_param.c |
| 26 | index 3dfe828bc..cc0b2b8b0 100644 |
| 27 | --- a/kernel/boot_param.c |
| 28 | +++ b/kernel/boot_param.c |
| 29 | @@ -10,7 +10,7 @@ |
| 30 | |
| 31 | #define BOOT_PARAM_STR_MAX_LEN 256 |
| 32 | |
| 33 | -static bool dual_boot; |
| 34 | +bool dual_boot; |
| 35 | module_param(dual_boot, bool, 0444); |
| 36 | |
| 37 | static bool no_split_rootfs_data; |
| 38 | -- |
| 39 | 2.34.1 |
| 40 | |