commit e98d50b5f77824cda968864c77b876c041dd2c09
author Luis Hector Chavez <lhchavez@google.com> Wed Feb 14 23:40:56 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 14 23:40:56 2018 +0000
tree a12ab1749be1fa2b91e813c8a0bfa68236f76579
parent 256d1c4181fc667e0752b08951246a598597705b
parent 448e8a0928bb4ebc3da96204c0be6ca7109f5451

Merge "init.rc: Remount / with MS_REMOUNT|MS_BIND" am: 008576080e
am: c37d85953e

Change-Id: I3c71332e0755ff980cd052d182d251b13f6b440e

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index f008c17..da3f824 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -318,8 +318,9 @@
     start hwservicemanager
     start vndservicemanager
 
-    # once everything is setup, no need to modify /
-    mount rootfs rootfs / ro remount
+    # Once everything is setup, no need to modify /.
+    # The bind+ro combination avoids modifying any other mount flags.
+    mount rootfs rootfs / remount bind ro
     # Mount shared so changes propagate into child namespaces
     mount rootfs rootfs / shared rec
     # Mount default storage into root namespace