From 671bd6f797a5f16e7300c0dfaa2a97473c7fda81 Mon Sep 17 00:00:00 2001 From: Tim Zimmermann Date: Sat, 16 Apr 2022 20:48:12 +0200 Subject: [PATCH] universal7885: Use omr as /metadata Change-Id: If93ec5ea8ce8770e23d2ba622fc8ae4e66ecfbbf --- universal7885-common/BoardConfigCommon.mk | 2 ++ universal7885-common/rootdir/etc/fstab.exynos7884B | 1 + universal7885-common/rootdir/etc/fstab.exynos7904 | 1 + universal7885-common/sepolicy/vendor/file_contexts | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/universal7885-common/BoardConfigCommon.mk b/universal7885-common/BoardConfigCommon.mk index fd7a00d..4eecd8d 100644 --- a/universal7885-common/BoardConfigCommon.mk +++ b/universal7885-common/BoardConfigCommon.mk @@ -63,6 +63,8 @@ TARGET_KERNEL_SOURCE := kernel/samsung/exynos7885 TARGET_KERNEL_CLANG_COMPILE := true KERNEL_LD := LD=ld.lld +BOARD_USES_METADATA_PARTITION := true + # Keymaster TARGET_KEYMASTER_VARIANT := samsung diff --git a/universal7885-common/rootdir/etc/fstab.exynos7884B b/universal7885-common/rootdir/etc/fstab.exynos7884B index aea54ba..19b7b2d 100644 --- a/universal7885-common/rootdir/etc/fstab.exynos7884B +++ b/universal7885-common/rootdir/etc/fstab.exynos7884B @@ -11,6 +11,7 @@ /dev/block/platform/13500000.dwmmc0/by-name/userdata /data f2fs nosuid,nodev,discard,noatime,lazytime,data_flush wait,check,quota /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 +/dev/block/platform/13500000.dwmmc0/by-name/omr /metadata ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait,first_stage_mount,formattable,check # 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 diff --git a/universal7885-common/rootdir/etc/fstab.exynos7904 b/universal7885-common/rootdir/etc/fstab.exynos7904 index aea54ba..19b7b2d 100644 --- a/universal7885-common/rootdir/etc/fstab.exynos7904 +++ b/universal7885-common/rootdir/etc/fstab.exynos7904 @@ -11,6 +11,7 @@ /dev/block/platform/13500000.dwmmc0/by-name/userdata /data f2fs nosuid,nodev,discard,noatime,lazytime,data_flush wait,check,quota /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 +/dev/block/platform/13500000.dwmmc0/by-name/omr /metadata ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait,first_stage_mount,formattable,check # 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 diff --git a/universal7885-common/sepolicy/vendor/file_contexts b/universal7885-common/sepolicy/vendor/file_contexts index e562259..4101741 100644 --- a/universal7885-common/sepolicy/vendor/file_contexts +++ b/universal7885-common/sepolicy/vendor/file_contexts @@ -36,13 +36,13 @@ /dev/block/platform/.+/by-name/metadata u:object_r:metadata_block_device:s0 /dev/block/platform/.+/by-name/misc u:object_r:misc_block_device:s0 /dev/block/platform/.+/by-name/modem u:object_r:modem_block_device:s0 -/dev/block/platform/.+/by-name/omr u:object_r:omr_block_device:s0 /dev/block/platform/.+/by-name/persistent u:object_r:frp_block_device:s0 /dev/block/platform/.+/by-name/radio u:object_r:radio_block_device:s0 /dev/block/platform/.+/by-name/recovery u:object_r:recovery_block_device:s0 /dev/block/platform/.+/by-name/sec_efs u:object_r:sec_efs_block_device:s0 /dev/block/platform/.+/by-name/super u:object_r:super_block_device:s0 /dev/block/platform/.+/by-name/userdata u:object_r:userdata_block_device:s0 +/dev/block/platform/.+/by-name/omr u:object_r:metadata_block_device:s0 /dev/esfp[0-9] u:object_r:fp_sensor_device:s0 /dev/batch_io u:object_r:io_device:s0