From 04d95eb26facfec6429d7ba63e42a665138ff834 Mon Sep 17 00:00:00 2001 From: Deokgyu Yang Date: Thu, 3 Jun 2021 18:26:51 +0900 Subject: [PATCH] gts3l: fs: Mount efs partition with the init and edit firmware mount option Signed-off-by: Deokgyu Yang Change-Id: Icaf54500424e205e2ccdb0de1d5323b42a674abc --- BoardConfig.mk | 8 +++++--- rootdir/etc/fstab.qcom | 7 +++---- rootdir/etc/init.target.rc | 15 +++++---------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index d340583..45e4888 100755 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -166,14 +166,16 @@ BOARD_SYSTEMIMAGE_PARTITION_SIZE := 4061331456 BOARD_USERDATAIMAGE_PARTITION_SIZE := 25680748544 BOARD_FLASH_BLOCK_SIZE := 131072 # (BOARD_KERNEL_PAGESIZE * 64) BOARD_ROOT_EXTRA_SYMLINKS := \ - /mnt/vendor/persist:/persist \ - /mnt/vendor/efs:/efs \ /vendor/dsp:/dsp \ /vendor/firmware-modem:/firmware-modem \ /vendor/firmware_mnt:/firmware \ - /vendor/bt_firmware:/bt_firmware + /vendor/bt_firmware:/bt_firmware \ + /mnt/vendor/persist:/persist TARGET_USES_MKE2FS := true +# Root +BOARD_ROOT_EXTRA_FOLDERS := efs + # Fingerprint TARGET_SEC_FP_HAL_VARIANT := bauth diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index d83ee4b..05220ef 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -8,11 +8,10 @@ /dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,noatime,barrier=1,noauto_da_alloc wait,check,encryptable=footer,quota,formattable /dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,nodiratime,inline_xattr,flush_merge,data_flush wait,check,formattable /dev/block/bootdevice/by-name/cache /cache ext4 nosuid,nodev,noatime,barrier=1 wait,check,formattable -/dev/block/bootdevice/by-name/apnhlos /vendor/firmware_mnt vfat ro,shortname=lower,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait -/dev/block/bootdevice/by-name/modem /vendor/firmware-modem vfat ro,shortname=lower,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,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait /dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 wait -/dev/block/bootdevice/by-name/efs /mnt/vendor/efs ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait +/dev/block/bootdevice/by-name/apnhlos /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/modem /vendor/firmware-modem 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/persist /mnt/vendor/persist ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait /dev/block/bootdevice/by-name/misc /misc emmc defaults defaults diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc index 763bc84..a642eba 100644 --- a/rootdir/etc/init.target.rc +++ b/rootdir/etc/init.target.rc @@ -32,7 +32,6 @@ import /vendor/etc/init/hw/init.${ro.product.vendor.device}.rc import /vendor/etc/init/hw/init.${ro.product.vendor.name}.rc on early-init - mkdir /mnt/vendor/persist 0771 system system symlink /data/tombstones /tombstones on fs @@ -42,19 +41,15 @@ on fs setprop ro.crypto.fde_algorithm AES-256-XTS swapon_all /vendor/etc/fstab.qcom - restorecon -R /mnt/vendor/efs - chmod 0771 /mnt/vendor/efs - chown radio system /mnt/vendor/efs - - restorecon_recursive /mnt/vendor/persist - chmod 0771 /mnt/vendor/persist - chown root system /mnt/vendor/persist + wait /dev/block/bootdevice/by-name/efs + mount ext4 /dev/block/bootdevice/by-name/efs /efs nosuid nodev noatime noauto_da_alloc,discard,journal_async_commit,errors=panic + chown radio system /efs + chmod 0771 /efs + restorecon -R /efs mkdir /mnt/vendor/persist/data 0700 system system mkdir /mnt/vendor/persist/rfs 0700 system system - restorecon_recursive /vendor/dsp - on init write /sys/module/qpnp_rtc/parameters/poweron_alarm 1