commit 60dd4690b32c5eb57ea2da13b301beabf3bf8a07
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 11 17:30:35 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 11 17:30:35 2022 +0000
tree bbff2c9bd0b337875a20ac59214938d4c90119b0
parent 7d294906d9f50b908dc96b2de17e458ad433af88
parent 9d0361068026adab7ab3797c66ddf25d8d39f6c9

Merge "remount: On initial overlay setup, return 0 instead of MUST_REBOOT"

fs_mgr/fs_mgr_remount.cpp

diff --git a/fs_mgr/fs_mgr_remount.cpp b/fs_mgr/fs_mgr_remount.cpp
index 86d095e..01517b0 100644
--- a/fs_mgr/fs_mgr_remount.cpp
+++ b/fs_mgr/fs_mgr_remount.cpp
@@ -128,7 +128,6 @@
     BAD_OVERLAY,
     NO_MOUNTS,
     REMOUNT_FAILED,
-    MUST_REBOOT,
     BINDER_ERROR,
     CHECKPOINTING,
     GSID_ERROR,
@@ -581,7 +580,7 @@
         } else {
             LOG(INFO) << "Now reboot your device for settings to take effect";
         }
-        return MUST_REBOOT;
+        return REMOUNT_SUCCESS;
     }
     if (result == REMOUNT_SUCCESS) {
         printf("remount succeeded\n");