commit 222ffc59197a80b3a92e4755e14a570243b8bcbc
author Chun-Wei Wang <wangchun@google.com> Fri Dec 15 14:40:56 2023 +0800
committer Chun-Wei Wang <wangchun@google.com> Mon Dec 18 07:03:07 2023 +0800
tree b743489134d349f779d40b983fdf4e7e728dfe62
parent 7341ffba7c24cf599b1350b0b7978aba299f5305

Disable DSU in recovery mode

DSU (modifying mounting paths) will cause OTA update
to fail in recovery mode

Bug: 315887685
Test: 1. enter DSU mode
      2. adb reboot recovery
      3. select "Apply update from ADB"
      4. adb sideload some-ota-update.zip
Change-Id: I6aec86893b7f8aa9e34f158269ebe2fd9dd98b33

fs_mgr/libfstab/fstab.cpp

diff --git a/fs_mgr/libfstab/fstab.cpp b/fs_mgr/libfstab/fstab.cpp
index 32460b1..443017a 100644
--- a/fs_mgr/libfstab/fstab.cpp
+++ b/fs_mgr/libfstab/fstab.cpp
@@ -716,7 +716,7 @@
     if (!ReadFstabFromFileCommon(path, fstab)) {
         return false;
     }
-    if (path != kProcMountsPath) {
+    if (path != kProcMountsPath && !InRecovery()) {
         if (!access(android::gsi::kGsiBootedIndicatorFile, F_OK)) {
             std::string dsu_slot;
             if (!android::gsi::GetActiveDsu(&dsu_slot)) {