commit 4bc527715237e9b9e903607102fbfc773ae9ecfd
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jul 18 05:58:42 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 18 05:58:42 2022 +0000
tree 741009c32fbfe9e4945694889ed061083f891c1b
parent 46fa45d82c91839ad5ff221cb59f984a7913ac79
parent a3832d496b2c51e22bd7b4992aa7bfe29f062506

Merge "first_stage_mount: Fix log typo "check_at_most_once""

init/first_stage_mount.cpp

diff --git a/init/first_stage_mount.cpp b/init/first_stage_mount.cpp
index 4bbbc20..07ce458 100644
--- a/init/first_stage_mount.cpp
+++ b/init/first_stage_mount.cpp
@@ -507,16 +507,16 @@
         SaveRamdiskPathToSnapuserd();
     }
 
-    if (MountPartition(system_partition, false /* erase_same_mounts */)) {
-        if (dsu_not_on_userdata_ && fs_mgr_verity_is_check_at_most_once(*system_partition)) {
-            LOG(ERROR) << "check_most_at_once forbidden on external media";
-            return false;
-        }
-        SwitchRoot("/system");
-    } else {
+    if (!MountPartition(system_partition, false /* erase_same_mounts */)) {
         PLOG(ERROR) << "Failed to mount /system";
         return false;
     }
+    if (dsu_not_on_userdata_ && fs_mgr_verity_is_check_at_most_once(*system_partition)) {
+        LOG(ERROR) << "check_at_most_once forbidden on external media";
+        return false;
+    }
+
+    SwitchRoot("/system");
 
     return true;
 }