Skip to content
This repository has been archived by the owner on Jul 29, 2023. It is now read-only.

Commit

Permalink
cleanup recovery.fstab and twrp.flags
Browse files Browse the repository at this point in the history
Signed-off-by: Bharat Dev Burman <[email protected]>
  • Loading branch information
crazo7924 committed Dec 26, 2021
1 parent 287a340 commit b06928b
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 150 deletions.
135 changes: 10 additions & 125 deletions recovery/root/system/etc/recovery.fstab
Original file line number Diff line number Diff line change
@@ -1,134 +1,19 @@
# 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 ext4 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
vendor /vendor ext4 ro wait,,avb,logical,first_stage_mount
product /product ext4 ro wait,,avb,logical,first_stage_mount
odm /odm ext4 ro wait,logical,first_stage_mount,nofail

my_product /my_product ext4 ro wait,logical,first_stage_mount,nofail
my_engineering /my_engineering ext4 ro wait,logical,first_stage_mount,nofail
my_company /my_company ext4 ro,barrier=1 wait,logical,first_stage_mount,nofail
my_carrier /my_carrier ext4 ro,barrier=1 wait,logical,first_stage_mount,nofail
my_region /my_region ext4 ro,barrier=1 wait,logical,first_stage_mount,nofail
my_heytap /my_heytap ext4 ro,barrier=1 wait,logical,first_stage_mount,nofail
my_stock /my_stock ext4 ro,barrier=1 wait,logical,first_stage_mount,nofail
my_preload /my_preload ext4 ro wait,logical,first_stage_mount,nofail
odm /odm ext4 ro wait,,avb,logical,first_stage_mount,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/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,checkpoint=fs,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized,keydirectory=/metadata/vold/metadata_encryption

/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 /mnt/vendor/protect_f ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
/dev/block/by-name/protect2 /mnt/vendor/protect_s ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
/dev/block/by-name/nvdata /mnt/vendor/nvdata ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
/dev/block/by-name/nvcfg /mnt/vendor/nvcfg ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable





/dev/block/mmcblk0p1 /external_sd vfat nosuid,nodev defaults
/dev/block/sdd1 /usb_otg vfat 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






/devices/platform/externdevice* auto auto defaults voldmanaged=sdcard1:auto


/devices/platform/11200000.usb_xhci* auto vfat defaults voldmanaged=usbotg:auto


/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/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/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/cam_vpu1 /cam_vpu1 emmc defaults defaults
/dev/block/by-name/cam_vpu2 /cam_vpu2 emmc defaults defaults
/dev/block/by-name/cam_vpu3 /cam_vpu3 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/audio_dsp /audio_dsp 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/mmcblk0p1 /external_sd auto nosuid,nodev defaults
/dev/block/sdd1 /usb_otg auto nosuid,nodev defaults

/dev/block/by-name/recovery /recovery emmc defaults first_stage_mount
/dev/block/by-name/boot /boot emmc defaults first_stage_mount

/dev/block/by-name/vbmeta /vbmeta emmc defaults defaults
/dev/block/by-name/vbmeta_vendor /vbmeta_vendor emmc defaults first_stage_mount
/dev/block/by-name/vbmeta_system /vbmeta_system emmc defaults first_stage_mount,avb=vbmeta

42 changes: 17 additions & 25 deletions recovery/root/system/etc/twrp.flags
Original file line number Diff line number Diff line change
@@ -1,28 +1,20 @@
# 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
# Logical partitions
system /system ext4
vendor /vendor ext4
product /product ext4 display="Product";logical,first_stage_mount
odm /odm ext4 display="ODM";logical,first_stage_mount

# Currently we dont have e2fsck compiled. So fs check would failed.

# <mount_point> <fstype> <device> <flags>
/boot emmc /dev/block/by-name/boot flags=backup=1;display="Boot";flashimg=1
/cache ext4 /dev/block/by-name/cache flags=backup=1;display="Cache";wipeingui
/dtbo emmc /dev/block/by-name/dtbo flags=backup=1;display="DTBO";flashimg=1
/recovery emmc /dev/block/by-name/recovery flags=backup=1;display="Recovery";flashimg=1
/vbmeta emmc /dev/block/by-name/vbmeta flags=backup=1;display="VBMeta";flashimg=1

/metadata ext4 /dev/block/by-name/metadata flags=display="Metadata"
/data f2fs /dev/block/by-name/userdata flags=fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized;keydirectory=/metadata/vold/metadata_encryption

/nvram emmc /dev/block/by-name/nvram flags=backup=1;display="NVRAM";backup=1
/nvcfg ext4 /dev/block/by-name/nvcfg flags=backup=1;display="NVCFG";backup=1;subpartitionof=/nvram
/nvdata ext4 /dev/block/by-name/nvdata flags=backup=1;display="NVDATA";backup=1;subpartitionof=/nvram
/protect_f ext4 /dev/block/by-name/protect1 flags=backup=1;display="Protect F";backup=1
/protect_s ext4 /dev/block/by-name/protect2 flags=backup=1;display="Protect S";backup=1

/vbmeta_system emmc /dev/block/by-name/vbmeta_system flags=backup=1;display="VBMeta (system)";flashimg=1;backup=1
/vbmeta_vendor emmc /dev/block/by-name/vbmeta_vendor flags=backup=1;display="VBMeta (vendor)";flashimg=1;backup=1
# Block device partitions
/metadata ext4 /dev/block/by-name/metadata
/data f2fs /dev/block/by-name/userdata flags=fileencryption=aes-256-xts:aes-256-cts:v2;keydirectory=/metadata/vold/metadata_encryption
/cache ext4 /dev/block/by-name/cache flags=display="Cache"
/boot emmc /dev/block/by-name/boot flags=backup=1;flashimg=1
/recovery emmc /dev/block/by-name/recovery flags=backup=1;flashimg=1
/dtbo emmc /dev/block/by-name/dtbo flags=display="DTBO"
/vbmeta emmc /dev/block/by-name/vbmeta flags=display="VBMeta"
/vbmeta_system emmc /dev/block/by-name/vbmeta_system flags=display="VBMeta (System)"
/vbmeta_vendor emmc /dev/block/by-name/vbmeta_vendor flags=display="VBMeta (Vendor)"

# External storages
/external_sd vfat /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;fsflags="utf8"
/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

0 comments on commit b06928b

Please sign in to comment.