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

Commit 5468545

Browse files
crazo7924crazo7924
committed
apollob: improve fstab along with twrp flags
Signed-off-by: Bharat Dev Burman <[email protected]> Change-Id: I3fff33193d18146bd26b84f0d4b60c67e8a2b9c1
1 parent e287a45 commit 5468545

File tree

2 files changed

+97
-35
lines changed

2 files changed

+97
-35
lines changed

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

+75-25
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,71 @@
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"
19
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
210
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
3-
411
vendor /vendor erofs ro wait,,avb,logical,first_stage_mount
512
vendor /vendor ext4 ro wait,,avb,logical,first_stage_mount
6-
713
product /product erofs ro wait,,avb,logical,first_stage_mount
814
product /product ext4 ro wait,,avb,logical,first_stage_mount
15+
my_odm /odm erofs ro wait,logical,first_stage_mount,nofail
16+
my_odm /odm ext4 ro wait,logical,first_stage_mount,nofail
17+
my_product /my_product erofs ro wait,logical,first_stage_mount,nofail
18+
my_product /my_product ext4 ro wait,logical,first_stage_mount,nofail
19+
my_engineering /my_engineering erofs ro wait,logical,first_stage_mount,nofail
20+
my_engineering /my_engineering ext4 ro wait,logical,first_stage_mount,nofail
21+
my_company.netease /my_company erofs ro,barrier=1 wait,logical,first_stage_mount,nofail
22+
my_company.netease /my_company ext4 ro,barrier=1 wait,logical,first_stage_mount,nofail
23+
my_carrier.vdf /my_carrier erofs ro,barrier=1 wait,logical,first_stage_mount,nofail
24+
my_carrier.vdf /my_carrier ext4 ro,barrier=1 wait,logical,first_stage_mount,nofail
25+
my_region.japan /my_region erofs ro,barrier=1 wait,logical,first_stage_mount,nofail
26+
my_region.japan /my_region ext4 ro,barrier=1 wait,logical,first_stage_mount,nofail
27+
my_heytap.x /my_heytap erofs ro,barrier=1 wait,logical,first_stage_mount,nofail
28+
my_heytap.x /my_heytap ext4 ro,barrier=1 wait,logical,first_stage_mount,nofail
29+
my_stock.x /my_stock erofs ro,barrier=1 wait,logical,first_stage_mount,nofail
30+
my_stock.x /my_stock ext4 ro,barrier=1 wait,logical,first_stage_mount,nofail
31+
my_preload.x /my_preload erofs ro wait,logical,first_stage_mount,nofail
32+
my_preload.x /my_preload ext4 ro wait,logical,first_stage_mount,nofail
933

10-
system_ext /system_ext erofs ro wait,,avb,logical,first_stage_mount
11-
system_ext /system_ext ext4 ro wait,,avb,logical,first_stage_mount
34+
/dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,check,formattable,first_stage_mount
35+
/dev/block/by-name/cache /cache ext4 noatime,nosuid,nodev,noauto_da_alloc,discard wait,check,formattable,first_stage_mount
1236

13-
odm /odm erofs ro wait,,logical,first_stage_mount,nofail
14-
odm /odm ext4 ro wait,,logical,first_stage_mount,nofail
37+
/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
1538

16-
/my_product /my_product none ro,bind wait,nofail
17-
/my_engineering /my_engineering none ro,bind wait,nofail
18-
/my_company /my_company none ro,bind wait,nofail
19-
/my_carrier /my_carrier none ro,bind wait,nofail
20-
/my_region /my_region none ro,bind wait,nofail
21-
/my_heytap /my_heytap none ro,bind wait,nofail
22-
/my_stock /my_stock none ro,bind wait,nofail
23-
/my_preload /my_preload none ro,bind wait,nofail
24-
/my_bigball /my_bigball none ro,bind wait,nofail
25-
/my_manifest /my_manifest none ro,bind wait,nofail
39+
40+
/dev/block/by-name/protect1 /mnt/vendor/protect_f ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
41+
/dev/block/by-name/protect2 /mnt/vendor/protect_s ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
42+
/dev/block/by-name/nvdata /mnt/vendor/nvdata ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
43+
/dev/block/by-name/nvcfg /mnt/vendor/nvcfg ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
44+
45+
46+
47+
48+
49+
/dev/block/mmcblk0p1 /external_sd vfat nosuid,nodev defaults
50+
/dev/block/sdd1 /usb_otg vfat nosuid,nodev defaults
51+
/dev/block/by-name/my_custom /my_custom ext4 ro nofail
52+
/dev/block/by-name/special_preload /special_preload ext4 ro wait,nofail
53+
/dev/block/by-name/cdt_engineering /cdt_engineering emmc defaults defaults
54+
55+
56+
57+
/dev/block/by-name/oplusreserve2 /oplusreserve ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
2658

2759

28-
/dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,check,formattable,first_stage_mount
2960

30-
/dev/block/by-name/cache /cache ext4 noatime,nosuid,nodev,noauto_da_alloc,discard wait,check,formattable
3161

32-
/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
33-
/dev/block/by-name/protect1 /protect_f ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
34-
/dev/block/by-name/protect2 /protect_s ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
35-
/dev/block/by-name/nvdata /nvdata ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
36-
/dev/block/by-name/nvcfg /nvcfg ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
3762

38-
/dev/block/by-name/persist /persist ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable
3963

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

42-
/devices/platform/mt_usb* auto vfat defaults voldmanaged=usbotg:auto
66+
67+
/devices/platform/11200000.usb_xhci* auto vfat defaults voldmanaged=usbotg:auto
68+
4369

4470
/dev/block/by-name/frp /persistent emmc defaults defaults
4571

@@ -50,10 +76,15 @@ odm /odm ext4 ro wait,,logical,first_stage_mount,nofail
5076
/dev/block/by-name/para /para emmc defaults defaults
5177
/dev/block/by-name/misc /misc emmc defaults defaults
5278

79+
5380
/dev/block/by-name/recovery /recovery emmc defaults first_stage_mount,nofail,
5481

5582
/dev/block/by-name/boot /boot emmc defaults first_stage_mount,nofail,
5683

84+
85+
86+
87+
5788
/dev/block/by-name/vbmeta_vendor /vbmeta_vendor emmc defaults first_stage_mount,nofail,
5889
/dev/block/by-name/vbmeta_system /vbmeta_system emmc defaults first_stage_mount,nofail,,avb=vbmeta
5990

@@ -64,32 +95,51 @@ odm /odm ext4 ro wait,,logical,first_stage_mount,nofail
6495
/dev/block/by-name/tee1 /tee1 emmc defaults defaults
6596
/dev/block/by-name/tee2 /tee2 emmc defaults defaults
6697

98+
6799
/dev/block/by-name/scp1 /scp1 emmc defaults defaults
68100
/dev/block/by-name/scp2 /scp2 emmc defaults defaults
69101

102+
70103
/dev/block/by-name/sspm_1 /sspm_1 emmc defaults defaults
71104
/dev/block/by-name/sspm_2 /sspm_2 emmc defaults defaults
72105

106+
73107
/dev/block/by-name/dpm_1 /dpm_1 emmc defaults defaults
74108
/dev/block/by-name/dpm_2 /dpm_2 emmc defaults defaults
75109

76110
/dev/block/by-name/mcupm_1 /mcupm_1 emmc defaults defaults
77111
/dev/block/by-name/mcupm_2 /mcupm_2 emmc defaults defaults
78112

113+
114+
79115
/dev/block/by-name/md1img /md1img emmc defaults defaults
80116
/dev/block/by-name/md1dsp /md1dsp emmc defaults defaults
81117
/dev/block/by-name/md1arm7 /md1arm7 emmc defaults defaults
82118
/dev/block/by-name/md3img /md3img emmc defaults defaults
83119

120+
/dev/block/by-name/cam_vpu1 /cam_vpu1 emmc defaults defaults
121+
/dev/block/by-name/cam_vpu2 /cam_vpu2 emmc defaults defaults
122+
/dev/block/by-name/cam_vpu3 /cam_vpu3 emmc defaults defaults
123+
84124
/dev/block/by-name/gz1 /gz1 emmc defaults defaults
85125
/dev/block/by-name/gz2 /gz2 emmc defaults defaults
86126

87127
/dev/block/by-name/spmfw /spmfw emmc defaults defaults
128+
129+
130+
131+
132+
133+
/dev/block/by-name/audio_dsp /audio_dsp emmc defaults defaults
134+
88135
/dev/block/by-name/pi_img /pi_img emmc defaults defaults
89136
/dev/block/by-name/boot_para /boot_para emmc defaults defaults
137+
90138
/dev/block/by-name/odmdtbo /odmdtbo emmc defaults defaults
91139
/dev/block/by-name/dtbo /dtbo emmc defaults defaults
92140

141+
93142
/dev/block/by-name/otp /otp emmc defaults defaults
94143

144+
95145
/dev/block/by-name/vbmeta /vbmeta emmc defaults defaults

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

+22-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,26 @@
1-
# Block device partitions
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
4+
5+
# mount point fstype device device2 flags
26
/metadata ext4 /dev/block/by-name/metadata
3-
/data f2fs /dev/block/by-name/userdata flags=fileencryption=aes-256-xts:aes-256-cts:v2;keydirectory=/metadata/vold/metadata_encryption
4-
/cache ext4 /dev/block/by-name/cache flags=display="Cache"
5-
/boot emmc /dev/block/by-name/boot flags=backup=1;flashimg=1
6-
/recovery emmc /dev/block/by-name/recovery flags=backup=1;flashimg=1
7-
/dtbo emmc /dev/block/by-name/dtbo flags=display="DTBO"
8-
/vbmeta emmc /dev/block/by-name/vbmeta flags=display="VBMeta";flashimg=1
9-
/vbmeta_system emmc /dev/block/by-name/vbmeta_system flags=display="VBMeta (System)"
10-
/vbmeta_vendor emmc /dev/block/by-name/vbmeta_vendor flags=display="VBMeta (Vendor)"
7+
/data f2fs /dev/block/by-name/userdata flags=fileencryption=aes-256-xts:aes-256-cts:v2;keydirectory=/metadata/vold/metadata_encryption
8+
/cache ext4 /dev/block/by-name/cache flags=display="Cache"
9+
/boot emmc /dev/block/by-name/boot flags=backup=1;flashimg=1
10+
/recovery emmc /dev/block/by-name/recovery flags=backup=1;flashimg=1
11+
/dtbo emmc /dev/block/by-name/dtbo flags=display="DTBO"
12+
/vbmeta emmc /dev/block/by-name/vbmeta flags=display="VBMeta";flashimg=1
13+
/vbmeta_system emmc /dev/block/by-name/vbmeta_system flags=display="VBMeta (System)"
14+
/vbmeta_vendor emmc /dev/block/by-name/vbmeta_vendor flags=display="VBMeta (Vendor)"
1115
/misc emmc /dev/block/by-name/misc
1216

1317
# External storages
14-
/usb_otg auto /dev/block/sdd1 flags=display="USB-OTG";storage;wipeingui;removable;backup=0
18+
/external_sd auto /dev/block/mmcblk1p1 /dev/block/mmcblk1 flags=display="Micro SD Card";storage;wipeingui;removable
19+
/usb_otg auto /dev/block/sdd1 /dev/block/sdd flags=display="USB-OTG";storage;wipeingui;removable;backup=0
20+
21+
# Flashable logical partitions
22+
/system_image emmc /dev/block/bootdevice/by-name/system flags=backup=1;display="System Image";flashimg=1
23+
/system_ext_image emmc /dev/block/bootdevice/by-name/system_ext flags=backup=1;display="System_ext Image";flashimg=1
24+
/vendor_image emmc /dev/block/bootdevice/by-name/vendor flags=backup=1;display="Vendor Image";flashimg=1
25+
/product_image emmc /dev/block/bootdevice/by-name/product flags=backup=1;display="Product Image";flashimg=1
26+
/odm_image emmc /dev/block/bootdevice/by-name/odm flags=backup=1;display="ODM Image";flashimg=1

0 commit comments

Comments
 (0)