From 74faf05b941682bd1930b92ae879c8baba09d6ac Mon Sep 17 00:00:00 2001 From: Leo Yan Date: Fri, 4 Jun 2021 15:19:33 +0100 Subject: [PATCH 3/4] remount: Fix failure for system-as-root Since commit 5ad7b3cbc5c1 ("Try to remount mounted points only"), the system-as-root cannot be remounted successfully when execute command "adb remount". This is because the mount point "/system" cannot be found and directly bails out with failure. Add an extra checking for the mount point "/system" for the system-as-root case, takes it as a found entry; thus the function can continue to run and fix up to remount root. Suggested-by: David Anderson Signed-off-by: Leo Yan Change-Id: Ia936c9d97bed951184813a087c70fe591cb33fe0 --- fs_mgr/fs_mgr_remount.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs_mgr/fs_mgr_remount.cpp b/fs_mgr/fs_mgr_remount.cpp index e685070a8..5411acacf 100644 --- a/fs_mgr/fs_mgr_remount.cpp +++ b/fs_mgr/fs_mgr_remount.cpp @@ -420,7 +420,8 @@ static int do_remount(int argc, char* argv[]) { 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; -- 2.36.0