From 103876d4af31e8b20276bcae367285f5458fa18e Mon Sep 17 00:00:00 2001 From: John Turner Date: Tue, 12 Aug 2025 15:37:38 -0400 Subject: move into conffile --- src/file/conffile.cil | 13 ++++++++++++- src/misc.cil | 13 ------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/file/conffile.cil b/src/file/conffile.cil index ac022ae..9f46cc5 100644 --- a/src/file/conffile.cil +++ b/src/file/conffile.cil @@ -3,7 +3,18 @@ (block conf - (blockinherit .file.conf.template)) + (blockinherit .file.conf.template) + + (filecon "/etc" dir file_context) + (filecon "/etc/.*" any file_context) + + (macro data_file_type_transition_file ((type ARG1)) + (call .data.file_type_transition + (ARG1 file dir "etc"))) + + (macro root_file_type_transition_file ((type ARG1)) + (call .root.file_type_transition + (ARG1 file dir "etc")))) (in file diff --git a/src/misc.cil b/src/misc.cil index a537370..6330878 100644 --- a/src/misc.cil +++ b/src/misc.cil @@ -3,19 +3,6 @@ (sidcontext init (sys.id sys.role sys.subj sys.lowlow)) ;; userspace_initial_context -(in conf - - (filecon "/etc" dir file_context) - (filecon "/etc/.*" any file_context) - - (macro data_file_type_transition_file ((type ARG1)) - (call .data.file_type_transition - (ARG1 file dir "etc"))) - - (macro root_file_type_transition_file ((type ARG1)) - (call .root.file_type_transition - (ARG1 file dir "etc")))) - (in config (filecon "/sys/kernel/config" dir ()) -- cgit v1.2.3