From 8128a9928775dc665dd6db391b56ebb0f75cdc7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=87=AF?= Date: Tue, 29 Jul 2025 09:11:59 +0000 Subject: [PATCH 1/2] update services/updater_main.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈凯 --- services/updater_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/updater_main.cpp b/services/updater_main.cpp index 451b250a..d131e848 100644 --- a/services/updater_main.cpp +++ b/services/updater_main.cpp @@ -624,7 +624,7 @@ static int CheckMountData() UPDATER_INIT_RECORD; constexpr int retryTime = 3; for (int i = 0; i < retryTime; i++) { - if (SetupPartitions() == 0) { + if (SetupPartitions(true, Utils::IsVabDevice()) == 0) { return 0; } LOG(INFO) << "retry mount userdata number:" << i; -- Gitee From 39333ce3248afd5b6229a947ce7ae107f9f8e0c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=87=AF?= Date: Tue, 29 Jul 2025 09:17:18 +0000 Subject: [PATCH 2/2] update services/updater.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈凯 --- services/updater.cpp | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/services/updater.cpp b/services/updater.cpp index 11f71017..4026a85c 100644 --- a/services/updater.cpp +++ b/services/updater.cpp @@ -362,6 +362,18 @@ UpdaterStatus ClearUpdateSuffixParam() return UPDATE_SUCCESS; } +bool IsNeedMountData(UpdaterParams &upParams, PackageUpdateMode updateMode) +{ + return updateMode != SDCARD_UPDATE || upParams.sdExtMode == SDCARD_UPDATE_FROM_DEV || + upParams.sdExtMode == SDCARD_UPDATE_FROM_DATA || Utils::CheckUpdateMode(Updater::SDCARD_INTRAL_MODE) || + Utils::CheckUpdateMode(Updater::FACTORY_INTERNAL_MODE); +} + +bool IsNeedMountMetadata(UpdaterParams &upParams, PackageUpdateMode updateMode) +{ + return Utils::IsVabDevice() && updateMode == HOTA_UPDATE; +} + UpdaterStatus DoInstallUpdaterBinfile(PkgManager::PkgManagerPtr pkgManager, UpdaterParams &upParams, PackageUpdateMode updateMode) { @@ -379,10 +391,7 @@ UpdaterStatus DoInstallUpdaterBinfile(PkgManager::PkgManagerPtr pkgManager, Upda return UPDATE_CORRUPT; } - if (SetupPartitions(updateMode != SDCARD_UPDATE || upParams.sdExtMode == SDCARD_UPDATE_FROM_DEV || - upParams.sdExtMode == SDCARD_UPDATE_FROM_DATA || Utils::CheckUpdateMode(Updater::SDCARD_INTRAL_MODE) || - Utils::CheckUpdateMode(Updater::FACTORY_INTERNAL_MODE), - Utils::IsVabDevice() && updateMode == HOTA_UPDATE) != 0) { + if (SetupPartitions(IsNeedMountData(upParams, updateMode), IsNeedMountMetadata(upParams, updateMode)) != 0) { UPDATER_UI_INSTANCE.ShowUpdInfo(TR(UPD_SETPART_FAIL), true); UPDATER_LAST_WORD(UPDATE_ERROR, "SetupPartitions failed"); return UPDATE_ERROR; @@ -437,10 +446,7 @@ UpdaterStatus DoInstallUpdaterPackage(PkgManager::PkgManagerPtr pkgManager, Upda return UPDATE_CORRUPT; } - if (SetupPartitions(updateMode != SDCARD_UPDATE || upParams.sdExtMode == SDCARD_UPDATE_FROM_DEV || - upParams.sdExtMode == SDCARD_UPDATE_FROM_DATA || Utils::CheckUpdateMode(Updater::SDCARD_INTRAL_MODE) || - Utils::CheckUpdateMode(Updater::FACTORY_INTERNAL_MODE), - Utils::IsVabDevice() && updateMode == HOTA_UPDATE) != 0) { + if (SetupPartitions(IsNeedMountData(upParams, updateMode), IsNeedMountMetadata(upParams, updateMode)) != 0) { UPDATER_UI_INSTANCE.ShowUpdInfo(TR(UPD_SETPART_FAIL), true); UPDATER_LAST_WORD(UPDATE_ERROR, "SetupPartitions failed"); return UPDATE_ERROR; -- Gitee