commit 44f1f094b3a387f42ede01bb40665c681a4e7df7
author Yi-yo Chiang <yochiang@google.com> Thu Jul 21 03:52:52 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 21 03:52:52 2022 +0000
tree 0b11f393446d728888dfec80b883d8c7c9e797f6
parent c20b6b58fcc59cb76d9de7ebaefeb74ad59fe123
parent 379be50f9c714871bbdebabeb3d1dd9e87c94d51

Merge "fs_mgr_overlayfs: Try "/system" and "/" when setting "/system" shared type"

fs_mgr/fs_mgr_overlayfs.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index 6942d0c..07eaf58 100644
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -642,6 +642,10 @@
     if (ret) {
         PERROR << "__mount(target=" << mount_point
                << ",flag=" << (shared_flag ? "MS_SHARED" : "MS_PRIVATE") << ")=" << ret;
+        // If "/system" doesn't look like a mountpoint, retry with "/".
+        if (errno == EINVAL && mount_point == "/system") {
+            return fs_mgr_overlayfs_set_shared_mount("/", shared_flag);
+        }
         return false;
     }
     return true;