commit 53f1fab6accde71b0e9c65cd0de664a07000ba7a
author Yi-yo Chiang <yochiang@google.com> Mon Jul 18 09:47:56 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 18 09:47:56 2022 +0000
tree 9ab982a9cfa31d7f91802c45a393e7045e252c20
parent 4bc527715237e9b9e903607102fbfc773ae9ecfd
parent d7e6353a69f6cc0b66198eb0a2726abe0f655dcb

Merge "first_stage_mount: Bind mount /system after switch root"

init/first_stage_mount.cpp

diff --git a/init/first_stage_mount.cpp b/init/first_stage_mount.cpp
index 07ce458..ff95487 100644
--- a/init/first_stage_mount.cpp
+++ b/init/first_stage_mount.cpp
@@ -518,6 +518,12 @@
 
     SwitchRoot("/system");
 
+    // Make /system a mountpoint so that adb-remount can move submounts under /system.
+    if (access("/system", F_OK) == 0 &&
+        mount("/system", "/system", nullptr, MS_BIND, nullptr) != 0) {
+        PLOG(WARNING) << "Failed to bind mount /system for overlayfs";
+    }
+
     return true;
 }