g12: Mount factory partition and make /mnt/vendor/ mounts optional

* Some devices have them some don't, don't fail to boot if we
  don't have it.

Change-Id: Iada51919e5c30309534c09666e2b41b291b4feb7
(cherry picked from commit ab5441bd5d8b0ea4b5f057a8b95000de3fbe6aa9)

diff --git a/init-files/fstab.amlogic b/init-files/fstab.amlogic
index 624c775150be4d9057c9b9f3c4138cd7e5b09f4f..3bf686d719038326124352589e9bffd1c71a605b 100644 (file)
--- a/init-files/fstab.amlogic
+++ b/init-files/fstab.amlogic
@@ -11,11 +11,12 @@ vendor_dlkm           /vendor_dlkm        ext4      ro,barrier=1
 /dev/block/cache      /cache              ext4      noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic    wait,check,formattable
 /dev/block/data       /data               ext4      noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic    wait,check,fileencryption=aes-256-xts:aes-256-cts:v1,quota,formattable,reservedsize=32M,checkpoint=block
 /dev/block/dtbo       /dtbo               emmc      defaults                                                         defaults
+/dev/block/factory    /mnt/vendor/factory ext4      noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic    wait,check,formattable,nofail
 /dev/block/metadata   /metadata           ext4      noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic    wait,check,formattable,first_stage_mount
 /dev/block/misc       /misc               emmc      defaults                                                         defaults
-/dev/block/param      /mnt/vendor/param   ext4      noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic    wait,check,quota,formattable
+/dev/block/param      /mnt/vendor/param   ext4      noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic    wait,check,quota,formattable,nofail
 /dev/block/recovery   /recovery           emmc      defaults                                                         recoveryonly
-/dev/block/tee        /mnt/vendor/tee     ext4      noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic    wait,check,formattable
+/dev/block/tee        /mnt/vendor/tee     ext4      noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic    wait,check,formattable,nofail
 
 ## Virtual devices
 /dev/block/loop       auto                loop      defaults                                                         voldmanaged=loop:auto

diff --git a/init-files/fstab_no_avb.amlogic b/init-files/fstab_no_avb.amlogic
index 1344c2bf409d3e2a3a3a1b357e0c36461fe043e7..b50523027b3f3c89e1f4fdca926413d86fb9c63a 100644 (file)
--- a/init-files/fstab_no_avb.amlogic
+++ b/init-files/fstab_no_avb.amlogic
@@ -11,9 +11,10 @@ vendor_dlkm           /vendor_dlkm        ext4      ro,barrier=1
 /dev/block/cache      /cache              ext4      noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic    wait,check,formattable
 /dev/block/data       /data               ext4      noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic    wait,check,fileencryption=aes-256-xts:aes-256-cts:v1,quota,formattable,reservedsize=32M,checkpoint=block
 /dev/block/dtbo       /dtbo               emmc      defaults                                                         defaults
+/dev/block/factory    /mnt/vendor/factory ext4      noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic    wait,check,formattable,nofail
 /dev/block/metadata   /metadata           ext4      noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic    wait,check,formattable,first_stage_mount
 /dev/block/misc       /misc               emmc      defaults                                                         defaults
-/dev/block/param      /mnt/vendor/param   ext4      noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic    wait,check,quota,formattable
+/dev/block/param      /mnt/vendor/param   ext4      noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic    wait,check,quota,formattable,nofail
 /dev/block/recovery   /recovery           emmc      defaults                                                         recoveryonly
 
 ## Virtual devices