Commit: a8611c0982c498a927b901fa7715fedd76f8d974 - system-core (git)

system/core

Commit MetaInfo

• Révision: a8611c0982c498a927b901fa7715fedd76f8d974 (tree)
• l'heure: 2019-04-03 07:25:04
• Auteur: Mark Salyzyn <salyzyn@goog...>
• Commiter: android-build-merger

Message de Log

Merge "fs_mgr: remount: system is root" am: 2b8e96bd64
am: 81e08d4c98

Change-Id: I31b0c419f36eb1019e8a981bd7a181c765d4a86f

Change Summary

• modified: fs_mgr/fs_mgr_remount.cpp

Modification

--- a/fs_mgr/fs_mgr_remount.cpp
+++ b/fs_mgr/fs_mgr_remount.cpp
@@ -340,6 +340,7 @@ int main(int argc, char* argv[]) {
                 blk_device = rentry.blk_device;
                 break;
             }
+            // Find overlayfs mount point?
             if ((mount_point == "/") && (rentry.mount_point == "/system")) {
                 blk_device = rentry.blk_device;
                 mount_point = "/system";
@@ -352,6 +353,12 @@ int main(int argc, char* argv[]) {
         }
         fs_mgr_set_blk_ro(blk_device, false);
 
+        // Find system-as-root mount point?
+        if ((mount_point == "/system") && !GetEntryForMountPoint(&mounts, mount_point) &&
+            GetEntryForMountPoint(&mounts, "/")) {
+            mount_point = "/";
+        }
+
         // Now remount!
         if (::mount(blk_device.c_str(), mount_point.c_str(), entry.fs_type.c_str(), MS_REMOUNT,
                     nullptr) == 0) {