aosp_common: dont verify vendor partition

Disable dm-verity for the vendor partition in AOSP builds. This allows the device to boot even though verity metadata is signed with a different key. Bug: 30074027 Change-Id: I79f1de03367d1bc465891d88cd1568b603ad3994
nychitman1 · Jul 14, 2016 · 062dfea · 062dfea
1 parent f4844f3
commit 062dfea
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/aosp_marlin.mk b/aosp_marlin.mk
@@ -28,6 +28,8 @@ PRODUCT_MODEL := AOSP on msm8996
 PRODUCT_MANUFACTURER := google
 PRODUCT_RESTRICT_VENDOR_FILES := true
 
+PRODUCT_COPY_FILES += device/google/marlin/fstab.aosp_common:root/fstab.marlin
+
 $(call inherit-product, device/google/marlin/device-marlin.mk)
 $(call inherit-product-if-exists, vendor/google_devices/marlin/device-vendor-marlin.mk)
 

diff --git a/aosp_sailfish.mk b/aosp_sailfish.mk
@@ -28,6 +28,8 @@ PRODUCT_MODEL := AOSP on msm8996
 PRODUCT_MANUFACTURER := google
 PRODUCT_RESTRICT_VENDOR_FILES := true
 
+PRODUCT_COPY_FILES += device/google/marlin/fstab.aosp_common:root/fstab.sailfish
+
 $(call inherit-product, device/google/marlin/device-sailfish.mk)
 $(call inherit-product-if-exists, vendor/google_devices/marlin/device-vendor-sailfish.mk)
 

diff --git a/fstab.aosp_common b/fstab.aosp_common
@@ -0,0 +1,18 @@
+# Android fstab file.
+# The filesystem that contains the filesystem checker binary (typically /system) cannot
+# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+
+#TODO: Add 'check' as fs_mgr_flags with data partition.
+# Currently we dont have e2fsck compiled. So fs check would failed.
+
+#<src>                                  <mnt_point>       <type>  <mnt_flags and options>                     <fs_mgr_flags>
+/dev/block/bootdevice/by-name/system    /           ext4    ro,barrier=1,discard                                wait,slotselect,verify
+/dev/block/bootdevice/by-name/vendor    /vendor     ext4    ro,barrier=1,discard                                wait,slotselect
+/dev/block/bootdevice/by-name/modem     /firmware/radio    vfat    ro,shortname=lower,uid=1000,gid=0,dmask=227,fmask=337,context=u:object_r:firmware_file:s0   wait,slotselect
+#/dev/block/bootdevice/by-name/userdata  /data             ext4    nosuid,nodev,barrier=1,noauto_da_alloc,discard      wait,check
+#/dev/block/platform/soc/624000.ufshc/by-name/system     /system           squashfs   ro
+/dev/block/bootdevice/by-name/userdata    /data             ext4    nosuid,nodev,barrier=1,noauto_da_alloc,discard      wait,check,formattable,fileencryption=ice
+#/devices/soc/74a4900.sdhci/mmc_host*    /storage/sdcard1  vfat    nosuid,nodev                                        wait,voldmanaged=sdcard1:auto,encryptable=footer
+/dev/block/zram0                        none              swap    defaults                                            zramsize=536870912
+/dev/block/bootdevice/by-name/misc        /misc           emmc  defaults defaults
+/devices/*/xhci-hcd.0.auto/usb*           auto              vfat    defaults                                            voldmanaged=usb:auto
diff --git a/fstab.common b/fstab.common
@@ -4,7 +4,7 @@
 
 #TODO: Add 'check' as fs_mgr_flags with data partition.
 # Currently we dont have e2fsck compiled. So fs check would failed.
-
+# NOTE: fstab.aosp_common is used for aosp. Make changes there as well.
 #<src>                                  <mnt_point>       <type>  <mnt_flags and options>                     <fs_mgr_flags>
 /dev/block/bootdevice/by-name/system    /           ext4    ro,barrier=1,discard                                wait,slotselect,verify
 /dev/block/bootdevice/by-name/vendor    /vendor     ext4    ro,barrier=1,discard                                wait,slotselect,verify