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

diff --git a/init-files/fstab.amlogic b/init-files/fstab.amlogic
index d3513fd1df75d6d5317ae2537cd9a3b1c7376e51..9945c3a01787fc8b343ee0b3d08fdd5bb5d41afd 100644 (file)
--- a/init-files/fstab.amlogic
+++ b/init-files/fstab.amlogic
@@ -10,11 +10,12 @@ vendor                /vendor             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 9d7abc4ab85021001a49f4d168cec2c76c717b2f..16e5ddd3456edf4074e65acd5df152beb78907c8 100644 (file)
--- a/init-files/fstab_no_avb.amlogic
+++ b/init-files/fstab_no_avb.amlogic
@@ -10,9 +10,10 @@ vendor                /vendor             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