Mount system_other with AVB verification.
This change overrides ro.postinstall.fstab.prefix to /product, for
cppreopt.rc to use product-specific /product/etc/fstab.postinstall (i.e.
/system/product/etc/fstab.postinstall) to mount system_other partition.
The AVB key is specified in this fstab to mount system_other with
dm-verity.
Bug: 129032485
Test: boot device and checks cppreopt results
init: processing action (ro.postinstall.fstab.prefix=/product && sys.cppreopt=requested) from (/system/etc/init/cppreopts.rc:27)
init: [libfs_avb]Returning avb_handle for '/postinstall' with status: Success
init: [libfs_avb]Built verity table: '1 /dev/block/by-name/system_a /dev/block/by-name/system_a 4096 4096 644999 644999 sha1 c6c7051bf32dbc20623fc5b5b99bad0b27233a0e 25e465b1dc1e8274beea7e4e5f2712f7e1a90e26 10 use_fec_from_device /dev/block/by-name/system_a fec_roots 2 fec_blocks 650080 fec_start 650080 restart_on_corruption ignore_zero_blocks'
Change-Id: I032bfcaaa463f9ab694bf056bf05f551b772980d
diff --git a/device.mk b/device.mk
index b2bd87a..d3f94e5 100755
--- a/device.mk
+++ b/device.mk
@@ -736,3 +736,10 @@
PRODUCT_PROPERTY_OVERRIDES += \
ro.apex.updatable=true
+
+# Use /product/etc/fstab.postinstall to mount system_other.
+PRODUCT_PRODUCT_PROPERTIES += \
+ ro.postinstall.fstab.prefix=/product
+
+PRODUCT_COPY_FILES += \
+ $(LOCAL_PATH)/fstab.postinstall:$(TARGET_COPY_OUT_PRODUCT)/etc/fstab.postinstall
diff --git a/fstab.postinstall b/fstab.postinstall
new file mode 100644
index 0000000..df8f77b
--- /dev/null
+++ b/fstab.postinstall
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
+/dev/block/by-name/system /postinstall ext4 ro,nosuid,nodev,noexec slotselect_other,avb_keys=/product/etc/security/avb/system_other.avbpubkey
