From ce7bdf88952d3b42ae183f9367d2e90ac11cde28 Mon Sep 17 00:00:00 2001 From: bluesky_wang Date: Wed, 7 Aug 2024 05:53:12 +0000 Subject: [PATCH 1/2] update services/sdcard_update/sdcard_update.cpp. Signed-off-by: bluesky_wang --- services/sdcard_update/sdcard_update.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/sdcard_update/sdcard_update.cpp b/services/sdcard_update/sdcard_update.cpp index f104c875..6ee486c6 100644 --- a/services/sdcard_update/sdcard_update.cpp +++ b/services/sdcard_update/sdcard_update.cpp @@ -98,10 +98,12 @@ UpdaterStatus CheckSdcardPkgs(UpdaterParams &upParams) LOG(INFO) << "get sd card from dev succeed, skip get package from sd card"; return UPDATE_SUCCESS; } + if (GetSdcardInternalPkgs(upParams) == UPDATE_SUCCESS) { LOG(INFO) << "get sdcard internal pkgs succeed"; return UPDATE_SUCCESS; } + std::string mountPoint = std::string(SDCARD_PATH); std::vector sdcardStr = GetBlockDevicesByMountPoint(mountPoint); if (sdcardStr.empty()) { @@ -129,6 +131,7 @@ UpdaterStatus CheckSdcardPkgs(UpdaterParams &upParams) } return UPDATE_SUCCESS; } + __attribute__((weak)) UpdaterStatus GetSdcardInternalPkgs(UpdaterParams &upParams) { LOG(INFO) << "not implemented get normal update sdcard pkgs"; -- Gitee From 6572fc6b36961eb25339915aa6853b224ab268c3 Mon Sep 17 00:00:00 2001 From: bluesky_wang Date: Wed, 7 Aug 2024 05:56:19 +0000 Subject: [PATCH 2/2] update services/updater.cpp. Signed-off-by: bluesky_wang --- services/updater.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/services/updater.cpp b/services/updater.cpp index 3bac7406..2bf70ddd 100644 --- a/services/updater.cpp +++ b/services/updater.cpp @@ -257,11 +257,9 @@ UpdaterStatus DoInstallUpdaterPackage(PkgManager::PkgManagerPtr pkgManager, Upda return UPDATE_CORRUPT; } - if (SetupPartitions(updateMode != SDCARD_UPDATE || - Utils::CheckUpdateMode(Updater::SDCARD_INTRAL_MODE) || - Utils::CheckUpdateMode(Updater::FACTORY_INTERNAL_MODE) || - upParams.sdExtMode == SDCARD_UPDATE_FROM_DATA || - upParams.sdExtMode == SDCARD_UPDATE_FROM_DEV) != 0) { + 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)) != 0) { UPDATER_UI_INSTANCE.ShowUpdInfo(TR(UPD_SETPART_FAIL), true); UPDATER_LAST_WORD(UPDATE_ERROR); return UPDATE_ERROR; -- Gitee