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

Commit b06928b

Browse files
crazo7924crazo7924
committed
cleanup recovery.fstab and twrp.flags
Signed-off-by: Bharat Dev Burman <[email protected]>
1 parent 287a340 commit b06928b

File tree

2 files changed

+27
-150
lines changed

2 files changed

+27
-150
lines changed

‎recovery/root/system/etc/recovery.fstab

+10-125
Original file line numberDiff line numberDiff line change
@@ -1,134 +1,19 @@
1-
# 1 "vendor/mediatek/proprietary/hardware/fstab/mt6853/fstab.in.mt6853"
2-
# 1 "<built-in>" 1
3-
# 1 "<built-in>" 3
4-
# 350 "<built-in>" 3
5-
# 1 "<command line>" 1
6-
# 1 "<built-in>" 2
7-
# 1 "vendor/mediatek/proprietary/hardware/fstab/mt6833/fstab.in.mt6833" 2
8-
# 141 "vendor/mediatek/proprietary/hardware/fstab/mt6833/fstab.in.mt6833"
9-
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
1+
system /system ext4 ro wait,,avb=vbmeta_system,logical,first_stage_mount
102
vendor /vendor ext4 ro wait,,avb,logical,first_stage_mount
113
product /product ext4 ro wait,,avb,logical,first_stage_mount
12-
odm /odm ext4 ro wait,logical,first_stage_mount,nofail
13-
14-
my_product /my_product ext4 ro wait,logical,first_stage_mount,nofail
15-
my_engineering /my_engineering ext4 ro wait,logical,first_stage_mount,nofail
16-
my_company /my_company ext4 ro,barrier=1 wait,logical,first_stage_mount,nofail
17-
my_carrier /my_carrier ext4 ro,barrier=1 wait,logical,first_stage_mount,nofail
18-
my_region /my_region ext4 ro,barrier=1 wait,logical,first_stage_mount,nofail
19-
my_heytap /my_heytap ext4 ro,barrier=1 wait,logical,first_stage_mount,nofail
20-
my_stock /my_stock ext4 ro,barrier=1 wait,logical,first_stage_mount,nofail
21-
my_preload /my_preload ext4 ro wait,logical,first_stage_mount,nofail
4+
odm /odm ext4 ro wait,,avb,logical,first_stage_mount,nofail
225

236
/dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,check,formattable,first_stage_mount
247
/dev/block/by-name/cache /cache ext4 noatime,nosuid,nodev,noauto_da_alloc,discard wait,check,formattable,first_stage_mount
8+
/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
259

26-
/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
27-
28-
29-
/dev/block/by-name/protect1 /mnt/vendor/protect_f ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
30-
/dev/block/by-name/protect2 /mnt/vendor/protect_s ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
31-
/dev/block/by-name/nvdata /mnt/vendor/nvdata ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
32-
/dev/block/by-name/nvcfg /mnt/vendor/nvcfg ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
33-
34-
35-
36-
37-
38-
/dev/block/mmcblk0p1 /external_sd vfat nosuid,nodev defaults
39-
/dev/block/sdd1 /usb_otg vfat nosuid,nodev defaults
40-
/dev/block/by-name/my_custom /my_custom ext4 ro nofail
41-
/dev/block/by-name/special_preload /special_preload ext4 ro wait,nofail
42-
/dev/block/by-name/cdt_engineering /cdt_engineering emmc defaults defaults
43-
44-
45-
46-
/dev/block/by-name/opporeserve2 /mnt/vendor/opporeserve ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
47-
48-
49-
50-
51-
52-
53-
/devices/platform/externdevice* auto auto defaults voldmanaged=sdcard1:auto
54-
55-
56-
/devices/platform/11200000.usb_xhci* auto vfat defaults voldmanaged=usbotg:auto
57-
58-
59-
/dev/block/by-name/frp /persistent emmc defaults defaults
60-
61-
/dev/block/by-name/nvram /nvram emmc defaults defaults
62-
/dev/block/by-name/proinfo /proinfo emmc defaults defaults
63-
/dev/block/by-name/lk /bootloader emmc defaults defaults
64-
/dev/block/by-name/lk2 /bootloader2 emmc defaults defaults
65-
/dev/block/by-name/para /para emmc defaults defaults
66-
/dev/block/by-name/misc /misc emmc defaults defaults
67-
68-
69-
/dev/block/by-name/recovery /recovery emmc defaults first_stage_mount,nofail,
70-
71-
/dev/block/by-name/boot /boot emmc defaults first_stage_mount,nofail,
72-
73-
74-
75-
76-
77-
/dev/block/by-name/vbmeta_vendor /vbmeta_vendor emmc defaults first_stage_mount,nofail,
78-
/dev/block/by-name/vbmeta_system /vbmeta_system emmc defaults first_stage_mount,nofail,,avb=vbmeta
79-
80-
/dev/block/by-name/logo /logo emmc defaults defaults
81-
/dev/block/by-name/expdb /expdb emmc defaults defaults
82-
/dev/block/by-name/seccfg /seccfg emmc defaults defaults
83-
84-
/dev/block/by-name/tee1 /tee1 emmc defaults defaults
85-
/dev/block/by-name/tee2 /tee2 emmc defaults defaults
86-
87-
88-
/dev/block/by-name/scp1 /scp1 emmc defaults defaults
89-
/dev/block/by-name/scp2 /scp2 emmc defaults defaults
90-
91-
92-
/dev/block/by-name/sspm_1 /sspm_1 emmc defaults defaults
93-
/dev/block/by-name/sspm_2 /sspm_2 emmc defaults defaults
94-
95-
96-
/dev/block/by-name/dpm_1 /dpm_1 emmc defaults defaults
97-
/dev/block/by-name/dpm_2 /dpm_2 emmc defaults defaults
98-
99-
/dev/block/by-name/mcupm_1 /mcupm_1 emmc defaults defaults
100-
/dev/block/by-name/mcupm_2 /mcupm_2 emmc defaults defaults
101-
102-
103-
104-
/dev/block/by-name/md1img /md1img emmc defaults defaults
105-
/dev/block/by-name/md1dsp /md1dsp emmc defaults defaults
106-
/dev/block/by-name/md1arm7 /md1arm7 emmc defaults defaults
107-
/dev/block/by-name/md3img /md3img emmc defaults defaults
108-
109-
/dev/block/by-name/cam_vpu1 /cam_vpu1 emmc defaults defaults
110-
/dev/block/by-name/cam_vpu2 /cam_vpu2 emmc defaults defaults
111-
/dev/block/by-name/cam_vpu3 /cam_vpu3 emmc defaults defaults
112-
113-
/dev/block/by-name/gz1 /gz1 emmc defaults defaults
114-
/dev/block/by-name/gz2 /gz2 emmc defaults defaults
115-
116-
/dev/block/by-name/spmfw /spmfw emmc defaults defaults
117-
118-
119-
120-
121-
122-
/dev/block/by-name/audio_dsp /audio_dsp emmc defaults defaults
123-
124-
/dev/block/by-name/pi_img /pi_img emmc defaults defaults
125-
/dev/block/by-name/boot_para /boot_para emmc defaults defaults
126-
127-
/dev/block/by-name/odmdtbo /odmdtbo emmc defaults defaults
128-
/dev/block/by-name/dtbo /dtbo emmc defaults defaults
129-
130-
131-
/dev/block/by-name/otp /otp emmc defaults defaults
10+
/dev/block/mmcblk0p1 /external_sd auto nosuid,nodev defaults
11+
/dev/block/sdd1 /usb_otg auto nosuid,nodev defaults
13212

13+
/dev/block/by-name/recovery /recovery emmc defaults first_stage_mount
14+
/dev/block/by-name/boot /boot emmc defaults first_stage_mount
13315

13416
/dev/block/by-name/vbmeta /vbmeta emmc defaults defaults
17+
/dev/block/by-name/vbmeta_vendor /vbmeta_vendor emmc defaults first_stage_mount
18+
/dev/block/by-name/vbmeta_system /vbmeta_system emmc defaults first_stage_mount,avb=vbmeta
19+

‎recovery/root/system/etc/twrp.flags

+17-25
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,20 @@
1-
# Android fstab file.
2-
# The filesystem that contains the filesystem checker binary (typically /system) cannot
3-
# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
1+
# Logical partitions
2+
system /system ext4
3+
vendor /vendor ext4
4+
product /product ext4 display="Product";logical,first_stage_mount
5+
odm /odm ext4 display="ODM";logical,first_stage_mount
46

5-
# Currently we dont have e2fsck compiled. So fs check would failed.
6-
7-
# <mount_point> <fstype> <device> <flags>
8-
/boot emmc /dev/block/by-name/boot flags=backup=1;display="Boot";flashimg=1
9-
/cache ext4 /dev/block/by-name/cache flags=backup=1;display="Cache";wipeingui
10-
/dtbo emmc /dev/block/by-name/dtbo flags=backup=1;display="DTBO";flashimg=1
11-
/recovery emmc /dev/block/by-name/recovery flags=backup=1;display="Recovery";flashimg=1
12-
/vbmeta emmc /dev/block/by-name/vbmeta flags=backup=1;display="VBMeta";flashimg=1
13-
14-
/metadata ext4 /dev/block/by-name/metadata flags=display="Metadata"
15-
/data f2fs /dev/block/by-name/userdata flags=fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized;keydirectory=/metadata/vold/metadata_encryption
16-
17-
/nvram emmc /dev/block/by-name/nvram flags=backup=1;display="NVRAM";backup=1
18-
/nvcfg ext4 /dev/block/by-name/nvcfg flags=backup=1;display="NVCFG";backup=1;subpartitionof=/nvram
19-
/nvdata ext4 /dev/block/by-name/nvdata flags=backup=1;display="NVDATA";backup=1;subpartitionof=/nvram
20-
/protect_f ext4 /dev/block/by-name/protect1 flags=backup=1;display="Protect F";backup=1
21-
/protect_s ext4 /dev/block/by-name/protect2 flags=backup=1;display="Protect S";backup=1
22-
23-
/vbmeta_system emmc /dev/block/by-name/vbmeta_system flags=backup=1;display="VBMeta (system)";flashimg=1;backup=1
24-
/vbmeta_vendor emmc /dev/block/by-name/vbmeta_vendor flags=backup=1;display="VBMeta (vendor)";flashimg=1;backup=1
7+
# Block device partitions
8+
/metadata ext4 /dev/block/by-name/metadata
9+
/data f2fs /dev/block/by-name/userdata flags=fileencryption=aes-256-xts:aes-256-cts:v2;keydirectory=/metadata/vold/metadata_encryption
10+
/cache ext4 /dev/block/by-name/cache flags=display="Cache"
11+
/boot emmc /dev/block/by-name/boot flags=backup=1;flashimg=1
12+
/recovery emmc /dev/block/by-name/recovery flags=backup=1;flashimg=1
13+
/dtbo emmc /dev/block/by-name/dtbo flags=display="DTBO"
14+
/vbmeta emmc /dev/block/by-name/vbmeta flags=display="VBMeta"
15+
/vbmeta_system emmc /dev/block/by-name/vbmeta_system flags=display="VBMeta (System)"
16+
/vbmeta_vendor emmc /dev/block/by-name/vbmeta_vendor flags=display="VBMeta (Vendor)"
2517

2618
# External storages
27-
/external_sd vfat /dev/block/mmcblk0p1 flags=display="External SD card";storage;wipeingui;removable;backup=0
28-
/usb_otg auto /dev/block/sdd1 flags=display="USB-OTG";storage;wipeingui;removable;backup=0;fsflags="utf8"
19+
/external_sd auto /dev/block/mmcblk0p1 flags=display="External SD card";storage;wipeingui;removable;backup=0
20+
/usb_otg auto /dev/block/sdd1 flags=display="USB-OTG";storage;wipeingui;removable;backup=0

0 commit comments

Comments
 (0)