diff options
| author | Leo Yan <leo.yan@linaro.org> | 2021-06-04 15:19:33 +0100 |
|---|---|---|
| committer | alk3pInjection <webmaster@raspii.tech> | 2022-01-11 21:20:40 +0800 |
| commit | bbc794030ca7e59dbd26b18ecc3b9855ff82584b (patch) | |
| tree | 48d49a36f746bfe8262a82e32618e04b6e31ab5d | |
| parent | 63d215bddb5d75119083237f0fe094e31a494a4d (diff) | |
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 <dvander@google.com>
Signed-off-by: Leo Yan <leo.yan@linaro.org>
Change-Id: Ia936c9d97bed951184813a087c70fe591cb33fe0
| -rw-r--r-- | fs_mgr/fs_mgr_remount.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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; |