From b7c9a20c8c802a053132a52bbc7cca1c0921473a Mon Sep 17 00:00:00 2001 From: John Turner Date: Sat, 23 Aug 2025 20:07:57 -0400 Subject: move "data" out of misc.cil --- src/file/datafile.cil | 16 +++++++++++++++- src/misc.cil | 16 ---------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/file/datafile.cil b/src/file/datafile.cil index 871a732..4662e2b 100644 --- a/src/file/datafile.cil +++ b/src/file/datafile.cil @@ -2,8 +2,22 @@ ;; SPDX-License-Identifier: Unlicense (block data + (blockinherit .file.data.template) + + (filecon "/opt" dir file_context) + (filecon "/opt/.*" any file_context) + + (filecon "/usr" dir file_context) + (filecon "/usr/.*" any file_context) + + (filecon "/tmp" symlink file_context) + + (macro root_file_type_transition_file ((type ARG1)) + (call .root.file_type_transition + (ARG1 file dir "opt")) + (call .root.file_type_transition + (ARG1 file dir "usr")))) - (blockinherit .file.data.template)) (in file diff --git a/src/misc.cil b/src/misc.cil index 97db5a0..858c401 100644 --- a/src/misc.cil +++ b/src/misc.cil @@ -3,22 +3,6 @@ (sidcontext init (sys.id sys.role sys.subj sys.lowlow)) ;; userspace_initial_context -(in data - - (filecon "/opt" dir file_context) - (filecon "/opt/.*" any file_context) - - (filecon "/usr" dir file_context) - (filecon "/usr/.*" any file_context) - - (filecon "/tmp" symlink file_context) - - (macro root_file_type_transition_file ((type ARG1)) - (call .root.file_type_transition - (ARG1 file dir "opt")) - (call .root.file_type_transition - (ARG1 file dir "usr")))) - (in db (filecon "/var/db" dir file_context) -- cgit v1.2.3