From 2128473f228e34876afad19b709bfa7fce71f032 Mon Sep 17 00:00:00 2001 From: bengris32 Date: Tue, 13 Sep 2022 20:00:14 +0100 Subject: [PATCH] rosemary: Reorganise fstab Signed-off-by: bengris32 Change-Id: I167c9b2c3d6c4a56436e227aed7b4dd4636bf72c --- rootdir/etc/fstab.mt6785 | 148 +++++++++++++-------------------------- 1 file changed, 49 insertions(+), 99 deletions(-) diff --git a/rootdir/etc/fstab.mt6785 b/rootdir/etc/fstab.mt6785 index 9796431..3172811 100644 --- a/rootdir/etc/fstab.mt6785 +++ b/rootdir/etc/fstab.mt6785 @@ -1,106 +1,56 @@ -# 1 "vendor/mediatek/proprietary/hardware/fstab/mt6785/fstab.in.mt6785" -# 1 "" 1 -# 1 "" 3 -# 341 "" 3 -# 1 "" 1 -# 1 "" 2 -# 1 "vendor/mediatek/proprietary/hardware/fstab/mt6785/fstab.in.mt6785" 2 -# 149 "vendor/mediatek/proprietary/hardware/fstab/mt6785/fstab.in.mt6785" -system /system ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey +# Android fstab file. +# +system /system ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey +vendor /vendor ext4 ro wait,slotselect,avb,logical,first_stage_mount +product /product ext4 ro wait,slotselect,avb,logical,first_stage_mount +/dev/block/platform/bootdevice/by-name/vbmeta /vbmeta emmc defaults defaults +/dev/block/platform/bootdevice/by-name/vbmeta_vendor /vbmeta_vendor emmc defaults first_stage_mount,nofail,slotselect +/dev/block/platform/bootdevice/by-name/vbmeta_system /vbmeta_system emmc defaults first_stage_mount,nofail,slotselect,avb=vbmeta -vendor /vendor ext4 ro wait,slotselect,avb,logical,first_stage_mount +/dev/block/platform/bootdevice/by-name/recovery /recovery emmc defaults first_stage_mount,nofail,slotselect +/dev/block/platform/bootdevice/by-name/boot /boot emmc defaults first_stage_mount,nofail,slotselect +/dev/block/platform/bootdevice/by-name/dtbo /dtbo emmc defaults defaults +/dev/block/platform/bootdevice/by-name/md_udc /metadata ext4 noatime,nosuid,nodev,discard wait,check,formattable,first_stage_mount +/dev/block/platform/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,flush_merge,reserve_root=134217,resgid=1065,alloc_mode=reuse,fsync_mode=nobarrier,inlinecrypt wait,check,formattable,quota,latemount,resize,reservedsize=128m,checkpoint=fs,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized,keydirectory=/metadata/vold/metadata_encryption,fsverity +/dev/block/platform/bootdevice/by-name/rescue /cache ext4 noatime,nosuid,nodev,noauto_da_alloc,discard wait,check,formattable +/dev/block/platform/bootdevice/by-name/frp /persistent emmc defaults defaults -product /product ext4 ro wait,slotselect,avb,logical,first_stage_mount +/dev/block/platform/bootdevice/by-name/protect1 /mnt/vendor/protect_f ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable +/dev/block/platform/bootdevice/by-name/protect2 /mnt/vendor/protect_s ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable +/dev/block/platform/bootdevice/by-name/nvdata /mnt/vendor/nvdata ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable +/dev/block/platform/bootdevice/by-name/nvcfg /mnt/vendor/nvcfg ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable +/dev/block/platform/bootdevice/by-name/rescue /mnt/rescue ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable +/dev/block/platform/bootdevice/by-name/persist /mnt/vendor/persist ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable +/dev/block/platform/bootdevice/by-name/nvram /nvram emmc defaults defaults +/dev/block/platform/bootdevice/by-name/proinfo /proinfo emmc defaults defaults +/dev/block/platform/bootdevice/by-name/misc /misc emmc defaults defaults +/dev/block/platform/bootdevice/by-name/para /para emmc defaults defaults +/dev/block/platform/bootdevice/by-name/expdb /expdb emmc defaults defaults +/dev/block/platform/bootdevice/by-name/boot_para /boot_para emmc defaults defaults +/dev/block/platform/bootdevice/by-name/lk /bootloader emmc defaults defaults +/dev/block/platform/bootdevice/by-name/lk2 /bootloader2 emmc defaults defaults +/dev/block/platform/bootdevice/by-name/tee1 /tee1 emmc defaults defaults +/dev/block/platform/bootdevice/by-name/tee2 /tee2 emmc defaults defaults +/dev/block/platform/bootdevice/by-name/logo /logo emmc defaults defaults +/dev/block/platform/bootdevice/by-name/scp1 /scp1 emmc defaults defaults +/dev/block/platform/bootdevice/by-name/scp2 /scp2 emmc defaults defaults +/dev/block/platform/bootdevice/by-name/sspm_1 /sspm_1 emmc defaults defaults +/dev/block/platform/bootdevice/by-name/sspm_2 /sspm_2 emmc defaults defaults +/dev/block/platform/bootdevice/by-name/md1img /md1img emmc defaults defaults +/dev/block/platform/bootdevice/by-name/md1dsp /md1dsp emmc defaults defaults +/dev/block/platform/bootdevice/by-name/cam_vpu1 /cam_vpu1 emmc defaults defaults +/dev/block/platform/bootdevice/by-name/cam_vpu2 /cam_vpu2 emmc defaults defaults +/dev/block/platform/bootdevice/by-name/cam_vpu3 /cam_vpu3 emmc defaults defaults +/dev/block/platform/bootdevice/by-name/gz1 /gz1 emmc defaults defaults +/dev/block/platform/bootdevice/by-name/gz2 /gz2 emmc defaults defaults +/dev/block/platform/bootdevice/by-name/spmfw /spmfw emmc defaults defaults +/dev/block/platform/bootdevice/by-name/audio_dsp /audio_dsp emmc defaults defaults +/dev/block/platform/bootdevice/by-name/otp /otp emmc defaults defaults +/dev/block/platform/bootdevice/by-name/seccfg /seccfg emmc defaults defaults - -/dev/block/platform/bootdevice/by-name/md_udc /metadata ext4 noatime,nosuid,nodev,discard wait,check,formattable,first_stage_mount - -/dev/block/platform/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,flush_merge,reserve_root=134217,resgid=1065,alloc_mode=reuse,fsync_mode=nobarrier,inlinecrypt wait,check,formattable,quota,latemount,resize,reservedsize=128m,checkpoint=fs,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized,keydirectory=/metadata/vold/metadata_encryption,fsverity - - - -/dev/block/platform/bootdevice/by-name/rescue /cache ext4 noatime,nosuid,nodev,noauto_da_alloc,discard wait,check,formattable - -/dev/block/platform/bootdevice/by-name/protect1 /mnt/vendor/protect_f ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable -/dev/block/platform/bootdevice/by-name/protect2 /mnt/vendor/protect_s ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable -/dev/block/platform/bootdevice/by-name/nvdata /mnt/vendor/nvdata ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable -/dev/block/platform/bootdevice/by-name/nvcfg /mnt/vendor/nvcfg ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable -/dev/block/platform/bootdevice/by-name/rescue /mnt/rescue ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable - - -/dev/block/platform/bootdevice/by-name/persist /mnt/vendor/persist ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable - - -/devices/platform/externdevice* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata -/devices/platform/usb3_xhci* auto vfat defaults voldmanaged=usbotg:auto - -/dev/block/platform/bootdevice/by-name/frp /persistent emmc defaults defaults - -/dev/block/platform/bootdevice/by-name/nvram /nvram emmc defaults defaults -/dev/block/platform/bootdevice/by-name/proinfo /proinfo emmc defaults defaults -/dev/block/platform/bootdevice/by-name/lk /bootloader emmc defaults defaults -/dev/block/platform/bootdevice/by-name/lk2 /bootloader2 emmc defaults defaults -/dev/block/platform/bootdevice/by-name/para /para emmc defaults defaults -/dev/block/platform/bootdevice/by-name/misc /misc emmc defaults defaults - - - - -/dev/block/platform/bootdevice/by-name/boot /boot emmc defaults first_stage_mount,nofail,slotselect - - - - - -/dev/block/platform/bootdevice/by-name/vbmeta_vendor /vbmeta_vendor emmc defaults first_stage_mount,nofail,slotselect -/dev/block/platform/bootdevice/by-name/vbmeta_system /vbmeta_system emmc defaults first_stage_mount,nofail,slotselect,avb=vbmeta - -/dev/block/platform/bootdevice/by-name/logo /logo emmc defaults defaults -/dev/block/platform/bootdevice/by-name/expdb /expdb emmc defaults defaults -/dev/block/platform/bootdevice/by-name/seccfg /seccfg emmc defaults defaults - -/dev/block/platform/bootdevice/by-name/tee1 /tee1 emmc defaults defaults -/dev/block/platform/bootdevice/by-name/tee2 /tee2 emmc defaults defaults - - -/dev/block/platform/bootdevice/by-name/scp1 /scp1 emmc defaults defaults -/dev/block/platform/bootdevice/by-name/scp2 /scp2 emmc defaults defaults - - -/dev/block/platform/bootdevice/by-name/sspm_1 /sspm_1 emmc defaults defaults -/dev/block/platform/bootdevice/by-name/sspm_2 /sspm_2 emmc defaults defaults - - - - -/dev/block/platform/bootdevice/by-name/md1img /md1img emmc defaults defaults -/dev/block/platform/bootdevice/by-name/md1dsp /md1dsp emmc defaults defaults - -/dev/block/platform/bootdevice/by-name/cam_vpu1 /cam_vpu1 emmc defaults defaults -/dev/block/platform/bootdevice/by-name/cam_vpu2 /cam_vpu2 emmc defaults defaults -/dev/block/platform/bootdevice/by-name/cam_vpu3 /cam_vpu3 emmc defaults defaults - -/dev/block/platform/bootdevice/by-name/gz1 /gz1 emmc defaults defaults -/dev/block/platform/bootdevice/by-name/gz2 /gz2 emmc defaults defaults - -/dev/block/platform/bootdevice/by-name/spmfw /spmfw emmc defaults defaults - - - - - -/dev/block/platform/bootdevice/by-name/audio_dsp /audio_dsp emmc defaults defaults - -/dev/block/platform/bootdevice/by-name/boot_para /boot_para emmc defaults defaults - -/dev/block/platform/bootdevice/by-name/dtbo /dtbo emmc defaults defaults - - -/dev/block/platform/bootdevice/by-name/otp /otp emmc defaults defaults - - -/dev/block/platform/bootdevice/by-name/vbmeta /vbmeta emmc defaults defaults +/devices/platform/externdevice* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata +/devices/platform/usb3_xhci* auto vfat defaults voldmanaged=usbotg:auto