From 96a150deacd183dc26fa330c4d70c124a046144a Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Fri, 29 Jul 2005 20:49:52 +0000 Subject: [PATCH] move file context validation to install --- refpolicy/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/refpolicy/Makefile b/refpolicy/Makefile index 8468f488..67687322 100644 --- a/refpolicy/Makefile +++ b/refpolicy/Makefile @@ -337,23 +337,25 @@ enableaudit: policy.conf # # Construct file_contexts # -$(FC): $(M4SUPPORT) tmp/generated_definitions.conf $(ALL_FC_FILES) $(FCSORT) $(POLVER) +$(FC): $(M4SUPPORT) tmp/generated_definitions.conf $(ALL_FC_FILES) $(FCSORT) ifeq ($(ALL_FC_FILES),) $(error No enabled modules! $(notdir $(MOD_CONF)) may need to be generated by using "make conf") endif + @echo "Creating file_contexts." @test -d tmp || mkdir -p tmp $(QUIET) m4 $(M4PARAM) $(M4SUPPORT) tmp/generated_definitions.conf $(ALL_FC_FILES) > tmp/$@.tmp $(QUIET) grep -e HOME -e ROLE tmp/$@.tmp > $(HOMEDIR_TEMPLATE) $(QUIET) sed -i -e /HOME/d -e /ROLE/d tmp/$@.tmp $(QUIET) $(FCSORT) tmp/$@.tmp $@ - @echo "Validating file_contexts." - $(SETFILES) -q -c $(POLVER) $(FC) ######################################## # # Install file_contexts # -$(FCPATH): $(FC) $(USERPATH)/system.users +$(FCPATH): $(FC) $(LOADPATH) $(USERPATH)/system.users + @echo "Validating file_contexts." + $(SETFILES) -q -c $(LOADPATH) $(FC) + @echo "Installing file_contexts." @mkdir -p $(CONTEXTPATH)/files $(QUIET) install -m 644 $(FC) $(FCPATH) $(QUIET) install -m 644 $(HOMEDIR_TEMPLATE) $(HOMEDIRPATH)