From: Nolen Johnson Date: Fri, 7 Jun 2024 21:18:06 +0000 (-0400) Subject: g12: Mount factory partition and make /mnt/vendor/ mounts optional X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=52d0a499092f6b52a5006960a1c7d39d07a5b3ba;p=GitHub%2FLineageOS%2FG12%2Fandroid_device_amlogic_g12-common.git 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 624c775..3bf686d 100644 --- 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 1344c2b..b505230 100644 --- 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