From e9841ab66307ba4cf007e64d4fcd2da3cca7614d Mon Sep 17 00:00:00 2001 From: Simon1511 Date: Wed, 11 May 2022 22:35:23 +0200 Subject: [PATCH] sm7125: Kill unused partitions Change-Id: I6295660f6f9a3662be58d6aee5831c95e5462e3a --- BoardConfigCommon.mk | 5 ----- rootdir/etc/fstab.default | 4 ---- sepolicy/vendor/file.te | 12 ------------ sepolicy/vendor/file_contexts | 5 ----- 4 files changed, 26 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 0ae4865..ea2a719 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -91,12 +91,7 @@ BOARD_MKBOOTIMG_ARGS += --kernel_offset $(BOARD_KERNEL_OFFSET) TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/config.fs BOARD_ROOT_EXTRA_FOLDERS += \ - prism \ - product \ - optics \ metadata \ - spu \ - misc \ efs # File systems diff --git a/rootdir/etc/fstab.default b/rootdir/etc/fstab.default index 6512f44..c7cf27b 100644 --- a/rootdir/etc/fstab.default +++ b/rootdir/etc/fstab.default @@ -44,16 +44,12 @@ odm /odm /dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic,sync wait,formattable,first_stage_mount,check # Add fs_mgr flag - sysfs_path=/sys/devices/platform/soc/xxxx.[ufshc|sdhci] to userdata entry, based on UFS|eMMC device. /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,metadata_encryption=aes-256-xts,keydirectory=/metadata/vold/metadata_encryption -/dev/block/platform/soc/1d84000.ufshc/by-name/prism /prism ext4 ro,barrier=1,discard nofail,first_stage_mount -/dev/block/platform/soc/1d84000.ufshc/by-name/optics /optics ext4 ro,barrier=1,discard nofail,first_stage_mount /dev/block/bootdevice/by-name/apnhlos /vendor/firmware_mnt vfat ro,shortname=lower,uid=0,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=0,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 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,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/carrier /carrier ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic defaults,nofail,check /dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 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,check -/dev/block/bootdevice/by-name/spu /spu ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait,nofail,check # Need to have this entry in here even though the mount point itself is no longer needed. # The update_engine code looks for this entry in order to determine the boot device address diff --git a/sepolicy/vendor/file.te b/sepolicy/vendor/file.te index 0320bd9..0925103 100644 --- a/sepolicy/vendor/file.te +++ b/sepolicy/vendor/file.te @@ -1,15 +1,3 @@ -type optics_file, fs_type; -allow optics_file labeledfs:filesystem associate; - -type prism_file, fs_type; -allow prism_file labeledfs:filesystem associate; - -type misc_file, fs_type; -allow misc_file labeledfs:filesystem associate; - -type spu_file, fs_type; -allow spu_file labeledfs:filesystem associate; - type sysfs_sec_switch, fs_type, sysfs_type; type sysfs_mdnie_writable, fs_type, sysfs_type; type sysfs_lcd_writable, fs_type, sysfs_type; diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index 4bc984a..15ccc59 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -1,8 +1,3 @@ -/optics(/.*)? u:object_r:optics_file:s0 -/prism(/.*)? u:object_r:prism_file:s0 -/misc(/.*)? u:object_r:misc_file:s0 -/spu(/.*)? u:object_r:spu_file:s0 - # sysfs /sys/devices/virtual/sec/switch(/.*)? u:object_r:sysfs_sec_switch:s0 /sys/class/lcd(/.*)? -- u:object_r:sysfs_lcd_writable:s0