Update init.rc and fstab to normal convention
Bug: 185767624
Test: boot and see data mounted
Change-Id: Iabeca8c4c03df586ee1a65e8274e3667c2bdd2dc
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 3ace4a6..85b5e0c 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -260,7 +260,7 @@
type: "compressed_cpio",
symlinks: [
{
- target: "etc/fstab",
+ target: "etc/fstab.microdroid",
name: "first_stage_ramdisk/fstab.microdroid",
},
{
@@ -272,8 +272,8 @@
prebuilt_etc {
name: "microdroid_fstab",
- src: "fstab",
- filename: "fstab",
+ src: "fstab.microdroid",
+ filename: "fstab.microdroid",
installable: false,
}
diff --git a/microdroid/fstab b/microdroid/fstab.microdroid
similarity index 100%
rename from microdroid/fstab
rename to microdroid/fstab.microdroid
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