From d08d2d3b8ef4831bd4e12206bfad4b5860833a6f Mon Sep 17 00:00:00 2001 From: OdSazib Date: Sat, 23 Jan 2021 22:30:29 +0600 Subject: [PATCH] sdm660-common: Format fstab with FBE encryption --- rootdir/etc/fstab.qcom | 31 ++++++++++++++----------------- rootdir/etc/fstab_A.qcom | 34 +++++++++++++++------------------- rootdir/etc/fstab_AB.qcom | 23 ++++++++++------------- 3 files changed, 39 insertions(+), 49 deletions(-) diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index 476e0a57..a77a7a1e 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -10,20 +10,17 @@ # Currently we dont have e2fsck compiled. So fs check would failed. # Non-A/B fstab.qcom variant -# -/dev/block/zram0 none swap sw zramsize=2147483648 -/dev/block/bootdevice/by-name/userdata /data ext4 nodev,noatime,nosuid,barrier=1,noauto_da_alloc,discard,lazytime wait,check,encryptable=footer,quota,reservedsize=128M -/dev/block/bootdevice/by-name/userdata /data f2fs nodev,noatime,nosuid,nodiratime,fsync_mode=nobarrier,background_gc=off wait,check,encryptable=footer,quota,reservedsize=128M -/devices/soc/c084000.sdhci/mmc_host* /storage/sdcard1 auto nodev,nosuid wait,voldmanaged=sdcard1:auto,encryptable=footer -/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults -/dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait -/dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait -/devices/soc/a800000.ssusb/a800000.dwc3/xhci-hcd.0.auto* /storage/usbotg auto nodev,nosuid wait,voldmanaged=usbotg:auto -/dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nodev,nosuid,barrier=1 wait -/dev/block/bootdevice/by-name/cache /cache ext4 nodev,noatime,nosuid,barrier=1 wait -/dev/block/bootdevice/by-name/cache /cache f2fs nodev,noatime,nosuid,nodiratime,discard,fsync_mode=nobarrier,inline_xattr,inline_data,data_flush wait -/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 nodev,noatime,nosuid,barrier=1 wait,check - -/dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait,recoveryonly -/dev/block/bootdevice/by-name/vendor /vendor ext4 ro,barrier=1 wait,recoveryonly -/dev/block/bootdevice/by-name/boot /boot emmc defaults defaults +# +/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,discard,background_gc=off,fsync_mode=nobarrier wait,quota,fileencryption=ice +/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,barrier=1,noauto_da_alloc,discard,noatime,lazytime,errors=panic wait,check,fileencryption=ice,quota +/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults +/dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait +/dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait +/devices/soc/a800000.ssusb/a800000.dwc3/xhci-hcd.0.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto +/dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 wait +/dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,discard,background_gc=off,fsync_mode=nobarrier wait,quota +/dev/block/bootdevice/by-name/cache /cache ext4 nosuid,nodev,noatime,barrier=1 wait +/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 nosuid,nodev,barrier=1,noatime wait,check +/dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait,recoveryonly +/dev/block/bootdevice/by-name/vendor /vendor ext4 ro,barrier=1 wait,recoveryonly +/dev/block/bootdevice/by-name/boot /boot emmc defaults defaults diff --git a/rootdir/etc/fstab_A.qcom b/rootdir/etc/fstab_A.qcom index 8ff78a88..3427ac83 100644 --- a/rootdir/etc/fstab_A.qcom +++ b/rootdir/etc/fstab_A.qcom @@ -2,28 +2,24 @@ # 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 -# NOTE: /system and /vendor partitions are now early-mounted and the fstab entry is specified in device tree (duplicated below for recovery image purposes only): -# /proc/device-tree/firmware/android/fstab/system +# NOTE: /vendor partition is now early-mounted and the fstab entry is specified in device tree (duplicated below for recovery image purposes only): # /proc/device-tree/firmware/android/fstab/vendor #TODO: Add 'check' as fs_mgr_flags with data partition. # Currently we dont have e2fsck compiled. So fs check would failed. # Non-A/B fstab.qcom variant -# -/dev/block/zram0 none swap sw zramsize=2147483648 -/dev/block/bootdevice/by-name/cust /metadata ext4 nodev,noatime,nosuid,discard wait,check,formattable -/dev/block/bootdevice/by-name/userdata /data ext4 nodev,noatime,nosuid,barrier=1,noauto_da_alloc,discard wait,check,fileencryption=ice,quota,reservedsize=512M -/devices/soc/c084000.sdhci/mmc_host* /storage/sdcard1 vfat nodev,nosuid wait,voldmanaged=sdcard1:auto,encryptable=footer -/dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait -/dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait -/dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nodev,nosuid,barrier=1 wait -/dev/block/bootdevice/by-name/cache /cache ext4 nodev,noatime,nosuid,barrier=1 wait -/dev/block/bootdevice/by-name/cache /cache f2fs nodev,noatime,nosuid,inline_xattr,flush_merge,data_flush wait,check -/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 nodev,nosuid,barrier=1 wait,check - -/dev/block/bootdevice/by-name/system / ext4 ro,barrier=1 wait -/dev/block/bootdevice/by-name/vendor /vendor ext4 ro,barrier=1 wait,recoveryonly -/dev/block/bootdevice/by-name/boot /boot emmc defaults defaults -/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults -/devices/soc/a800000.ssusb/a800000.dwc3/xhci-hcd.0.auto* /storage/usbotg vfat nodev,nosuid wait,voldmanaged=usbotg:auto +# +/dev/block/bootdevice/by-name/system / ext4 ro,barrier=1,discard wait,avb +/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,barrier=1,noauto_da_alloc,noatime,lazytime wait,resize,check,fileencryption=ice,crashcheck,quota,reservedsize=128M +/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults +/dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait +/dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait +/devices/soc/a800000.ssusb/a800000.dwc3/xhci-hcd.0.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto +/dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 wait +/dev/block/bootdevice/by-name/cache /cache ext4 nosuid,nodev,noatime,barrier=1 wait +/dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,discard,background_gc=off,fsync_mode=nobarrier wait,quota +/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 nosuid,nodev,barrier=1,noatime wait,check +/devices/soc/c084000.sdhci/mmc_host* auto auto nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=userdata +/dev/block/bootdevice/by-name/vendor /vendor ext4 ro,barrier=1 wait,recoveryonly +/dev/block/bootdevice/by-name/boot /boot emmc defaults defaults diff --git a/rootdir/etc/fstab_AB.qcom b/rootdir/etc/fstab_AB.qcom index d025eefc..154e2c45 100644 --- a/rootdir/etc/fstab_AB.qcom +++ b/rootdir/etc/fstab_AB.qcom @@ -6,16 +6,13 @@ # Currently we dont have e2fsck compiled. So fs check would failed. # A/B fstab.qcom variant -# -/dev/block/zram0 none swap sw zramsize=2147483648 -/dev/block/bootdevice/by-name/system / ext4 ro,barrier=1,discard wait,slotselect -/dev/block/bootdevice/by-name/userdata /data ext4 nodev,noatime,nosuid,barrier=1,noauto_da_alloc,discard,lazytime wait,check,encryptable=footer,quota,formattable,length=-16384 -/dev/block/bootdevice/by-name/userdata /data f2fs nodev,noatime,nosuid,inline_xattr,reserve_root=32768,resgid=1065,background_gc=on wait,check,encryptable=footer,quota,formattable,length=-16384 -/devices/soc/c084000.sdhci/mmc_host* /storage/sdcard1 vfat nodev,nosuid wait,voldmanaged=sdcard1:auto,encryptable=footer -/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults -/dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=0,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect -/dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait,slotselect -/dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nodev,nosuid,barrier=1 wait,slotselect -/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 nodev,noatime,nosuid,barrier=1 wait - -/devices/soc/a800000.ssusb/a800000.dwc3/xhci-hcd.0.auto* /storage/usbotg vfat nodev,nosuid wait,voldmanaged=usbotg:auto +# +/dev/block/bootdevice/by-name/system / ext4 ro,barrier=1,discard wait,slotselect,verify +/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,barrier=0,noauto_da_alloc,discard,noatime,lazytime wait,resize,check,crashcheck,quota,fileencryption=ice +/dev/block/bootdevice/by-name/userdata /data f2fs nodev,noatime,nosuid,inline_xattr,reserve_root=32768,resgid=1065,background_gc=on wait,resize,check,crashcheck,quota,fileencryption=ice +/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults +/dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect +/dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait,slotselect +/devices/soc/a800000.ssusb/a800000.dwc3/xhci-hcd.0.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto +/dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 wait,slotselect +/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 nosuid,nodev,barrier=1,noatime wait,check