universal7885: Fixup merge errors

This commit is contained in:
roynatech2544 2021-10-31 20:51:11 +09:00
commit 93778fc639
No known key found for this signature in database
GPG key ID: 9675C32163D88D30
7 changed files with 122 additions and 21 deletions

View file

@ -0,0 +1,16 @@
# Android fstab file.
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
# 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
# system and vendor partition will be early-mounted by kernel
# /dev/block/platform/13500000.dwmmc0/by-name/system /system ext4 ro wait
/dev/block/platform/13500000.dwmmc0/by-name/cache /cache ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait,check
/dev/block/platform/13500000.dwmmc0/by-name/userdata /data ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait,check,encryptable=footer,quota,reservedsize=128M,length=-20480
/dev/block/platform/13500000.dwmmc0/by-name/efs /mnt/vendor/efs ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait,check
/dev/block/platform/13500000.dwmmc0/by-name/misc /misc emmc defaults defaults
# VOLD :: fstab.a20e
/dev/block/platform/13500000.dwmmc0/by-name/hidden /preload ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic voldmanaged=preload:auto,check
/devices/platform/13550000.dwmmc2/mmc_host/mmc1* auto vfat defaults voldmanaged=sdcard:auto
/devices/platform/13600000.usb/13600000.dwc3* auto auto defaults voldmanaged=usb:auto