From 26aa7952d539f85dd60e36a5fcc37925a9b92d65 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 29 Sep 2020 01:46:25 +0100 Subject: [PATCH] image.mk: evaluate /etc/selinux/config to choose SELinux policy Instead of hardcoding 'targeted' policy, evaluate /etc/selinux/config in rootfs to choose according to which policy files in the rootfs got to be labeled. Signed-off-by: Daniel Golle --- include/image.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/image.mk b/include/image.mk index f72095db5634..28f40fe6a990 100644 --- a/include/image.mk +++ b/include/image.mk @@ -243,10 +243,11 @@ endef ifeq ($(CONFIG_TARGET_ROOTFS_SECURITY_LABELS),y) define Image/mkfs/squashfs + echo ". $(call mkfs_target_dir,$(1))/etc/selinux/config" > $@.fakeroot-script echo "$(STAGING_DIR_HOST)/bin/setfiles -r" \ "$(call mkfs_target_dir,$(1))" \ - "$(call mkfs_target_dir,$(1))/etc/selinux/targeted/contexts/files/file_contexts " \ - "$(call mkfs_target_dir,$(1))" > $@.fakeroot-script + "$(call mkfs_target_dir,$(1))/etc/selinux/\$${SELINUXTYPE}/contexts/files/file_contexts " \ + "$(call mkfs_target_dir,$(1))" >> $@.fakeroot-script echo "$(Image/mkfs/squashfs-common)" >> $@.fakeroot-script chmod +x $@.fakeroot-script $(FAKEROOT) "$@.fakeroot-script" -- 2.30.2