Mount /metadata in first-stage init.
Bug: 141941121
Test: vts_gsi_boot_test
Change-Id: I0fd2d93a7d8f5bfbfd95bf918177dc3bfab44495
diff --git a/shared/config/fstab b/shared/config/fstab
index d6b40a6..234e01b 100644
--- a/shared/config/fstab
+++ b/shared/config/fstab
@@ -2,7 +2,7 @@
system /system ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect
# Add all non-dynamic partitions except system, after this comment
/dev/block/by-name/userdata /data ext4 nodev,noatime,nosuid,errors=panic wait,fileencryption=aes-256-xts:aes-256-cts
-/dev/block/by-name/metadata /metadata ext4 nodev,noatime,nosuid,errors=panic wait,formattable
+/dev/block/by-name/metadata /metadata ext4 nodev,noatime,nosuid,errors=panic wait,formattable,first_stage_mount
/dev/block/by-name/cache /cache ext4 nodev,noatime,nosuid,errors=panic wait
/dev/block/by-name/misc /misc emmc defaults defaults
# Add all dynamic partitions except system, after this comment
diff --git a/shared/config/fstab.composite b/shared/config/fstab.composite
index 3fed495..f64e510 100644
--- a/shared/config/fstab.composite
+++ b/shared/config/fstab.composite
@@ -3,7 +3,7 @@
# Add all non-dynamic partitions except system, after this comment
/dev/block/by-name/userdata /data ext4 nodev,noatime,nosuid,errors=panic wait,fileencryption=aes-256-xts:aes-256-cts
/dev/block/by-name/cache /cache ext4 nodev,noatime,nosuid,errors=panic wait
-/dev/block/by-name/metadata /metadata ext4 nodev,noatime,nosuid,errors=panic wait,formattable
+/dev/block/by-name/metadata /metadata ext4 nodev,noatime,nosuid,errors=panic wait,formattable,first_stage_mount
/dev/block/by-name/misc /misc emmc defaults defaults
# Add all dynamic partitions except system, after this comment
vendor /vendor ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect
