update recovery.fstab and twrp.flags

Signed-off-by: Bharat Dev Burman <[email protected]>
Change-Id: I15a9524c9f9cced15c3ee88ad997ea9427ef65c2

Author: crazo7924

recovery/root/system/etc/recovery.fstab

@@ -1,53 +1,95 @@
-# 1 "vendor/mediatek/proprietary/hardware/fstab/mt6853/fstab.in.mt6853"
-# 1 "<built-in>" 1
-# 1 "<built-in>" 3
-# 350 "<built-in>" 3
-# 1 "<command line>" 1
-# 1 "<built-in>" 2
-# 1 "vendor/mediatek/proprietary/hardware/fstab/mt6833/fstab.in.mt6833" 2
-# 141 "vendor/mediatek/proprietary/hardware/fstab/mt6833/fstab.in.mt6833"
-system /system auto ro wait,,avb=vbmeta_system,logical,first_stage_mount
-vendor /vendor auto ro wait,,avb,logical,first_stage_mount
-product /product auto ro wait,,avb,logical,first_stage_mount
-odm /odm auto ro wait,logical,first_stage_mount
-
-my_product /my_product auto ro wait,logical,first_stage_mount,nofail
-my_engineering /my_engineering auto ro wait,logical,first_stage_mount,nofail
-my_company /my_company auto ro,barrier=1 wait,logical,first_stage_mount,nofail
-my_carrier /my_carrier auto ro,barrier=1 wait,logical,first_stage_mount,nofail
-my_region /my_region auto ro,barrier=1 wait,logical,first_stage_mount,nofail
-my_heytap /my_heytap auto ro,barrier=1 wait,logical,first_stage_mount,nofail
-my_stock /my_stock auto ro,barrier=1 wait,logical,first_stage_mount,nofail
-my_preload /my_preload auto ro wait,logical,first_stage_mount,nofail
+system /system erofs ro wait,,avb=vbmeta_system,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey
+system /system ext4 ro wait,,avb=vbmeta_system,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey
+
+vendor /vendor erofs ro wait,,avb,logical,first_stage_mount
+vendor /vendor ext4 ro wait,,avb,logical,first_stage_mount
+
+product /product erofs ro wait,,avb,logical,first_stage_mount
+product /product ext4 ro wait,,avb,logical,first_stage_mount
+
+system_ext /system_ext erofs ro wait,,avb,logical,first_stage_mount
+system_ext /system_ext ext4 ro wait,,avb,logical,first_stage_mount
+
+odm /odm erofs ro wait,,logical,first_stage_mount,nofail
+odm /odm ext4 ro wait,,logical,first_stage_mount,nofail
+
+/my_product /my_product none ro,bind wait,nofail
+/my_engineering /my_engineering none ro,bind wait,nofail
+/my_company /my_company none ro,bind wait,nofail
+/my_carrier /my_carrier none ro,bind wait,nofail
+/my_region /my_region none ro,bind wait,nofail
+/my_heytap /my_heytap none ro,bind wait,nofail
+/my_stock /my_stock none ro,bind wait,nofail
+/my_preload /my_preload none ro,bind wait,nofail
+/my_bigball /my_bigball none ro,bind wait,nofail
+/my_manifest /my_manifest none ro,bind wait,nofail
+
 
 /dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,check,formattable,first_stage_mount
-/dev/block/by-name/cache /cache ext4 noatime,nosuid,nodev,noauto_da_alloc,discard wait,check,formattable,first_stage_mount
+
+/dev/block/by-name/cache /cache ext4 noatime,nosuid,nodev,noauto_da_alloc,discard wait,check,formattable
+
 /dev/block/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,noflush_merge,fsync_mode=nobarrier,reserve_root=134217,resgid=1065,inlinecrypt wait,check,formattable,quota,reservedsize=128m,latemount,resize,checkpoint=fs,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized,keydirectory=/metadata/vold/metadata_encryption,fsverity
+/dev/block/by-name/protect1 /protect_f ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
+/dev/block/by-name/protect2 /protect_s ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
+/dev/block/by-name/nvdata /nvdata ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
+/dev/block/by-name/nvcfg /nvcfg ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
+
+/dev/block/by-name/persist /persist ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
+
+/devices/platform/externdevice* auto auto defaults voldmanaged=sdcard1:auto
+
+/devices/platform/mt_usb* auto vfat defaults voldmanaged=usbotg:auto
 
-/dev/block/mmcblk0p1 /external_sd auto nosuid,nodev defaults
-/dev/block/sdd1 /usb_otg auto nosuid,nodev defaults
-
-#/dev/block/by-name/my_custom /my_custom ext4 ro nofail
-#/dev/block/by-name/special_preload /special_preload ext4 ro wait,nofail
-#/dev/block/by-name/cdt_engineering /cdt_engineering emmc defaults defaults
-#/dev/block/by-name/opporeserve2 /mnt/vendor/opporeserve ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
-#/dev/block/by-name/frp /persistent emmc defaults defaults
-#/dev/block/by-name/nvram /nvram emmc defaults defaults
-#/dev/block/by-name/proinfo /proinfo emmc defaults defaults
-#/dev/block/by-name/lk /bootloader emmc defaults defaults
-#/dev/block/by-name/lk2 /bootloader2 emmc defaults defaults
-#/dev/block/by-name/para /para emmc defaults defaults
-#/dev/block/by-name/otp /otp emmc defaults defaults
+/dev/block/by-name/frp /persistent emmc defaults defaults
+
+/dev/block/by-name/nvram /nvram emmc defaults defaults
+/dev/block/by-name/proinfo /proinfo emmc defaults defaults
+/dev/block/by-name/lk /bootloader emmc defaults defaults
+/dev/block/by-name/lk2 /bootloader2 emmc defaults defaults
+/dev/block/by-name/para /para emmc defaults defaults
+/dev/block/by-name/misc /misc emmc defaults defaults
 
 /dev/block/by-name/recovery /recovery emmc defaults first_stage_mount,nofail,
+
 /dev/block/by-name/boot /boot emmc defaults first_stage_mount,nofail,
-/dev/block/by-name/misc /misc emmc defaults defaults
 
-/dev/block/by-name/vbmeta /vbmeta emmc defaults defaults
 /dev/block/by-name/vbmeta_vendor /vbmeta_vendor emmc defaults first_stage_mount,nofail,
 /dev/block/by-name/vbmeta_system /vbmeta_system emmc defaults first_stage_mount,nofail,,avb=vbmeta
 
-#/dev/block/by-name/pi_img /pi_img emmc defaults defaults
-#/dev/block/by-name/boot_para /boot_para emmc defaults default
-#/dev/block/by-name/odmdtbo /odmdtbo emmc defaults defaults
-#/dev/block/by-name/dtbo /dtbo emmc defaults defaults
+/dev/block/by-name/logo /logo emmc defaults defaults
+/dev/block/by-name/expdb /expdb emmc defaults defaults
+/dev/block/by-name/seccfg /seccfg emmc defaults defaults
+
+/dev/block/by-name/tee1 /tee1 emmc defaults defaults
+/dev/block/by-name/tee2 /tee2 emmc defaults defaults
+
+/dev/block/by-name/scp1 /scp1 emmc defaults defaults
+/dev/block/by-name/scp2 /scp2 emmc defaults defaults
+
+/dev/block/by-name/sspm_1 /sspm_1 emmc defaults defaults
+/dev/block/by-name/sspm_2 /sspm_2 emmc defaults defaults
+
+/dev/block/by-name/dpm_1 /dpm_1 emmc defaults defaults
+/dev/block/by-name/dpm_2 /dpm_2 emmc defaults defaults
+
+/dev/block/by-name/mcupm_1 /mcupm_1 emmc defaults defaults
+/dev/block/by-name/mcupm_2 /mcupm_2 emmc defaults defaults
+
+/dev/block/by-name/md1img /md1img emmc defaults defaults
+/dev/block/by-name/md1dsp /md1dsp emmc defaults defaults
+/dev/block/by-name/md1arm7 /md1arm7 emmc defaults defaults
+/dev/block/by-name/md3img /md3img emmc defaults defaults
+
+/dev/block/by-name/gz1 /gz1 emmc defaults defaults
+/dev/block/by-name/gz2 /gz2 emmc defaults defaults
+
+/dev/block/by-name/spmfw /spmfw emmc defaults defaults
+/dev/block/by-name/pi_img /pi_img emmc defaults defaults
+/dev/block/by-name/boot_para /boot_para emmc defaults defaults
+/dev/block/by-name/odmdtbo /odmdtbo emmc defaults defaults
+/dev/block/by-name/dtbo /dtbo emmc defaults defaults
+
+/dev/block/by-name/otp /otp emmc defaults defaults
+
+/dev/block/by-name/vbmeta /vbmeta emmc defaults defaults

recovery/root/system/etc/twrp.flags

@@ -11,5 +11,4 @@
 /misc			emmc	/dev/block/by-name/misc
 
 # External storages
-/external_sd		auto	/dev/block/mmcblk0p1			flags=display="External SD card";storage;wipeingui;removable;backup=0
 /usb_otg		auto	/dev/block/sdd1				flags=display="USB-OTG";storage;wipeingui;removable;backup=0