commit 67ab436363a812f9b775a85a3779ca6334018712
author Inseob Kim <inseob@google.com> Tue May 11 16:51:03 2021 +0900
committer Inseob Kim <inseob@google.com> Wed May 26 17:17:05 2021 +0900
tree 2eb73476ff8ef266f17b43ac790a6eae4d28a9bd
parent 66f81817e668a2f454e1aa50269cdfd50d9d6585

Update init.rc and fstab to normal convention

Bug: 185767624
Test: boot and see data mounted
Change-Id: Iabeca8c4c03df586ee1a65e8274e3667c2bdd2dc

microdroid/init.rc

diff --git a/microdroid/init.rc b/microdroid/init.rc
index 3c46501..121afaa 100644
--- a/microdroid/init.rc
+++ b/microdroid/init.rc
@@ -114,8 +114,17 @@
 
     start adbd
 
+on late-fs
+    mount_all /vendor/etc/fstab.microdroid --late
+
 on post-fs-data
-    mount_all /vendor/etc/fstab --late
+    mark_post_data
+
+    # We chown/chmod /data again so because mount is run as root + defaults
+    chown system system /data
+    chmod 0771 /data
+
+    # We restorecon /data in case the userdata partition has been reset.
     restorecon /data
 
     mkdir /data/vendor 0771 root root encryption=Require