| commit | db6cb42d5f116a516b218e7cc20c9f50ac580fd7 | [log] [tgz] |
|---|---|---|
| author | Chun-Wei Wang <wangchun@google.com> | Tue Dec 19 03:57:26 2023 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Dec 19 03:57:26 2023 +0000 |
| tree | 55b9e7a5de0a626ce45d4c75293167fe59cde646 | |
| parent | 97807b79e66a0afcb53ae26bbefa53b11345b7df [diff] | |
| parent | 222ffc59197a80b3a92e4755e14a570243b8bcbc [diff] |
Merge "Disable DSU in recovery mode" into main
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)) {