commit d5e5ba7e96f55d56d9d8932492da687b2f557cd5
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jun 04 20:42:22 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 04 20:42:22 2021 +0000
tree c96f7c49447eb5a65bcfc0a4feffb6148106ea70
parent 391056ea733bdea7167ddc0648da12196074c3f4
parent e81be34c85590c1f35059e3310dbbf3d6e3e0cf8

Merge "remount: Fix failure for system-as-root"

fs_mgr/fs_mgr_remount.cpp

diff --git a/fs_mgr/fs_mgr_remount.cpp b/fs_mgr/fs_mgr_remount.cpp
index e685070..5411aca 100644
--- a/fs_mgr/fs_mgr_remount.cpp
+++ b/fs_mgr/fs_mgr_remount.cpp
@@ -420,7 +420,8 @@
                 break;
             }
             // Find overlayfs mount point?
-            if ((mount_point == "/") && (rentry.mount_point == "/system")) {
+            if ((mount_point == "/" && rentry.mount_point == "/system")  ||
+                (mount_point == "/system" && rentry.mount_point == "/")) {
                 blk_device = rentry.blk_device;
                 mount_point = "/system";
                 found = true;