diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 67fd3bb..18a9885 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -241,17 +241,9 @@ BOARD_PROVIDES_LIBRIL := true ENABLE_VENDOR_RIL_SERVICE := true # Rootfs -BOARD_ROOT_EXTRA_FOLDERS := \ - carrier \ - dqmdbg \ +BOARD_ROOT_EXTRA_FOLDERS += \ efs \ - keydata \ - keyrefuge \ metadata \ - omr \ - optics \ - prism \ - spu \ TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/config.fs diff --git a/config.fs b/config.fs index e098388..21a5abc 100644 --- a/config.fs +++ b/config.fs @@ -217,68 +217,14 @@ user: AID_SYSTEM group: AID_SYSTEM caps: 0 -[carrier/] -mode: 0771 -user: AID_SYSTEM -group: AID_RADIO -caps: 0 - -[dqmdbg/] -mode: 0770 -user: AID_SYSTEM -group: AID_SYSTEM -caps: 0 - [dsp/] mode: 0771 user: AID_MEDIA group: AID_MEDIA caps: 0 -[efs/] -mode: 0771 -user: AID_SYSTEM -group: AID_RADIO -caps: 0 - -[keydata/] -mode: 0771 -user: AID_SYSTEM -group: AID_SYSTEM -caps: 0 - -[keyrefuge/] -mode: 0771 -user: AID_SYSTEM -group: AID_SYSTEM -caps: 0 - [metadata/] mode: 0771 user: AID_ROOT group: AID_SYSTEM caps: 0 - -[optics/] -mode: 0771 -user: AID_ROOT -group: AID_SYSTEM -caps: 0 - -[persist/] -mode: 0771 -user: AID_SYSTEM -group: AID_SYSTEM -caps: 0 - -[prism/] -mode: 0771 -user: AID_ROOT -group: AID_SYSTEM -caps: 0 - -[spu/] -mode: 0770 -user: AID_SYSTEM -group: AID_SYSTEM -caps: 0 diff --git a/recovery/root/fstab.qcom b/recovery/root/fstab.qcom index df2a6a3..66a6c07 100644 --- a/recovery/root/fstab.qcom +++ b/recovery/root/fstab.qcom @@ -17,8 +17,6 @@ system_ext /system_ext ext4 ro,barrier=1 wait,logical,first_stage_mount product /product ext4 ro wait,logical,first_stage_mount vendor /vendor ext4 ro wait,logical,first_stage_mount odm /odm ext4 ro wait,logical,first_stage_mount -/dev/block/platform/soc/1d84000.ufshc/by-name/prism /prism ext4 ro,barrier=1,discard nofail,avb,first_stage_mount -/dev/block/platform/soc/1d84000.ufshc/by-name/optics /optics ext4 ro,barrier=1,discard nofail,avb,first_stage_mount /dev/block/platform/soc/1d84000.ufshc/by-name/vbmeta /vbmeta emmc defaults first_stage_mount /dev/block/platform/soc/1d84000.ufshc/by-name/metadata /metadata ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic,sync wait,first_stage_mount,formattable,check /dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,usrquota,grpquota,fsync_mode=nobarrier,reserve_root=32768,resgid=5678,inlinecrypt latemount,wait,check,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized,quota,reservedsize=128M,checkpoint=fs @@ -30,7 +28,6 @@ odm /odm ext4 ro wait,logical,first_stage_mount /dev/block/bootdevice/by-name/efs /mnt/vendor/efs ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait,check /dev/block/bootdevice/by-name/sec_efs /efs ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait,check /dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 wait -/dev/block/bootdevice/by-name/carrier /carrier ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic defaults,nofail,check #VOLD #/devices/platform/soc/1da4000.ufshc_card/host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=footer diff --git a/rootdir/vendor/etc/fstab.qcom b/rootdir/vendor/etc/fstab.qcom index e409eac..194a071 100644 --- a/rootdir/vendor/etc/fstab.qcom +++ b/rootdir/vendor/etc/fstab.qcom @@ -43,8 +43,6 @@ system_ext /system_ext ext4 ro,barrier=1 wait,logical,first_stage_mount product /product ext4 ro wait,logical,first_stage_mount vendor /vendor ext4 ro wait,logical,first_stage_mount odm /odm ext4 ro wait,logical,first_stage_mount -/dev/block/platform/soc/1d84000.ufshc/by-name/prism /prism ext4 ro,barrier=1,discard nofail,avb,first_stage_mount -/dev/block/platform/soc/1d84000.ufshc/by-name/optics /optics ext4 ro,barrier=1,discard nofail,avb,first_stage_mount /dev/block/platform/soc/1d84000.ufshc/by-name/metadata /metadata ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic,sync wait,first_stage_mount,formattable,check /dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,usrquota,grpquota,fsync_mode=nobarrier,reserve_root=32768,resgid=5678,inlinecrypt latemount,wait,check,fileencryption=aes-256-xts:aes-256-cts:v2,quota,reservedsize=128M,checkpoint=fs @@ -56,7 +54,6 @@ odm /odm ext4 ro wait,logical,first_stage_mount /dev/block/bootdevice/by-name/efs /mnt/vendor/efs ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait,check /dev/block/bootdevice/by-name/sec_efs /efs ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait,check /dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 wait -/dev/block/bootdevice/by-name/carrier /carrier ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic defaults,nofail,check #VOLD #/devices/platform/soc/1da4000.ufshc_card/host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=footer diff --git a/sepolicy/vendor/file.te b/sepolicy/vendor/file.te index 3c5ab0e..1c193bf 100644 --- a/sepolicy/vendor/file.te +++ b/sepolicy/vendor/file.te @@ -46,24 +46,6 @@ type proc_reset_reason, fs_type, proc_type; type proc_simslot_count, fs_type, proc_type; type proc_swappiness, fs_type, proc_type; -# Rootfs -type carrier_file, fs_type; -allow carrier_file labeledfs:filesystem associate; - -type dqmdbgblk_file, fs_type; -allow dqmdbgblk_file labeledfs:filesystem associate; - -type keydata_data_file, fs_type; -allow keydata_data_file labeledfs:filesystem associate; - -type keyrefuge_data_file, fs_type; -allow keyrefuge_data_file labeledfs:filesystem associate; - -type omr_file, file_type, mlstrustedobject; - -type spu_file, fs_type; -allow spu_file labeledfs:filesystem associate; - # SysFS type sysfs_camera, sysfs_type, r_fs_type, fs_type; type sysfs_fingerprint, sysfs_type, r_fs_type, fs_type; diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index 22a000d..15ea603 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -199,14 +199,6 @@ # Rootfs /avb(/.*)? u:object_r:system_file:s0 -/carrier(/.*)? u:object_r:carrier_file:s0 -/dqmdbg(/.*)? u:object_r:dqmdbgblk_file:s0 -/keydata(/.*)? u:object_r:keydata_data_file:s0 -/keyrefuge(/.*)? u:object_r:keyrefuge_data_file:s0 -/omr(/.*)? u:object_r:omr_file:s0 -/optics(/.*)? u:object_r:vendor_file:s0 -/prism(/.*)? u:object_r:system_file:s0 -/spu(/.*)? u:object_r:spu_file:s0 # Sys /sys/class/camera(/.*)? -- u:object_r:sysfs_camera_writable:s0 diff --git a/sepolicy/vendor/init.te b/sepolicy/vendor/init.te index 7128def..557c655 100644 --- a/sepolicy/vendor/init.te +++ b/sepolicy/vendor/init.te @@ -1,5 +1,4 @@ allow init efs_file:dir mounton; -allow init omr_file:dir mounton; allow init debugfs_tracing_debug:dir mounton; allow init misc_block_device:blk_file w_file_perms;