From 26ed37c9917d3640630fa27ec402b8efb52d9c79 Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Wed, 6 Jan 2021 13:51:03 -0500 Subject: [PATCH] Makefile: Add -E to setfiles labeling targets. This will cause setfiles to error if there are conflicting labeling specifications for files due to hardlinks. closes #218 Signed-off-by: Chris PeBenito --- INSTALL | 4 ++-- Makefile | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/INSTALL b/INSTALL index ca7d7b198..3df5c1677 100644 --- a/INSTALL +++ b/INSTALL @@ -2,8 +2,8 @@ Reference Policy has the following runtime requirements: * Linux kernel >= 2.6.33 Reference Policy has the following build requirements: - * SELinux userspace 2.8 - * Python >= 3.4 + * SELinux userspace 3.0 + * Python >= 3.5 When developing a policy, running scripts from directory testing/ requires: * Python >= 3.6 diff --git a/Makefile b/Makefile index 6ba215f1a..ef0265af6 100644 --- a/Makefile +++ b/Makefile @@ -614,7 +614,7 @@ checklabels: echo "No filesystems with extended attributes found!" ;\ false ;\ fi - $(verbose) $(SETFILES) -v -n $(fcpath) $(filesystems) + $(verbose) $(SETFILES) -E -v -n $(fcpath) $(filesystems) restorelabels: @echo "Restoring labels on filesystem types: $(fs_names)" @@ -622,7 +622,7 @@ restorelabels: echo "No filesystems with extended attributes found!" ;\ false ;\ fi - $(verbose) $(SETFILES) -v $(fcpath) $(filesystems) + $(verbose) $(SETFILES) -E -v $(fcpath) $(filesystems) relabel: @echo "Relabeling filesystem types: $(fs_names)" @@ -630,7 +630,7 @@ relabel: echo "No filesystems with extended attributes found!" ;\ false ;\ fi - $(verbose) $(SETFILES) $(fcpath) $(filesystems) + $(verbose) $(SETFILES) -E $(fcpath) $(filesystems) resetlabels: @echo "Resetting labels on filesystem types: $(fs_names)" @@ -638,7 +638,7 @@ resetlabels: echo "No filesystems with extended attributes found!" ;\ false ;\ fi - $(verbose) $(SETFILES) -F $(fcpath) $(filesystems) + $(verbose) $(SETFILES) -E -F $(fcpath) $(filesystems) ######################################## #