try 3 on rhel4 fixes

This commit is contained in:
Chris PeBenito 2006-04-07 15:16:49 +00:00
parent a3e785d582
commit 5d92a2089a

View File

@ -170,18 +170,19 @@ enableaudit: $(POLICY_CONF)
# Construct file_contexts # Construct file_contexts
# #
$(FC): $(TMPDIR)/$(notdir $(FC)).tmp $(FCSORT) $(FC): $(TMPDIR)/$(notdir $(FC)).tmp $(FCSORT)
$(verbose) $(FCSORT) $< $@
ifeq "$(DISTRO)" "rhel4" ifeq "$(DISTRO)" "rhel4"
# the old genhomedircon used in RHEL4 makes assumptions on # the old genhomedircon used in RHEL4 makes assumptions on
# the directory strucure of the policy. need to set up a mini # the directory strucure of the policy. need to set up a mini
# environment with this structure for correct functioning. # environment with this structure for correct functioning.
@ mkdir -p $(TMPDIR)/rhel4 @ mkdir -p $(TMPDIR)/rhel4
@ cp $@ $(TMPDIR)/rhel4 $(verbose) $(FCSORT) $< > $(TMPDIR)/rhel4/$(@F).tmp
@ $(M4) $(M4PARAM) $(M4SUPPORT) $(USER_FILES) > $(TMPDIR)/rhel4/users $(verbose) $(M4) $(M4PARAM) $(M4SUPPORT) $(USER_FILES) > $(TMPDIR)/rhel4/users
$(verbose) $(GREP) -v "^/root" $< > $(TMPDIR)/rhel4/$(@F).root $(verbose) $(GREP) -v "^/root" $(TMPDIR)/rhel4/$(@F).tmp > $(TMPDIR)/rhel4/$(@F).root
$(verbose) ( cd $(TMPDIR)/rhel4/users ; $(GENHOMEDIRCON) . $(@F).root > $@ ) $(verbose) ( cd $(TMPDIR)/rhel4 ; $(GENHOMEDIRCON) . $(@F).root > $(@F) )
$(verbose) $(GREP) "^/root" $< >> $@ $(verbose) $(GREP) "^/root" $(TMPDIR)/rhel4/$(@F).tmp >> $(TMPDIR)/rhel4/file_contexts
$(verpose) cp $(TMPDIR)/rhel4/file_contexts $@
else else
$(verbose) $(FCSORT) $< $@
$(verbose) $(GREP) -e HOME -e ROLE $@ > $(HOMEDIR_TEMPLATE) $(verbose) $(GREP) -e HOME -e ROLE $@ > $(HOMEDIR_TEMPLATE)
$(verbose) $(SED) -i -e /HOME/d -e /ROLE/d $@ $(verbose) $(SED) -i -e /HOME/d -e /ROLE/d $@
endif endif
@ -204,7 +205,7 @@ $(FCPATH): $(FC) $(LOADPATH) $(USERPATH)/system.users
@echo "Installing file_contexts." @echo "Installing file_contexts."
@mkdir -p $(CONTEXTPATH)/files @mkdir -p $(CONTEXTPATH)/files
ifeq "$(DISTRO)" "rhel4" ifeq "$(DISTRO)" "rhel4"
$(verbose) install -m $(FC) $@ $(verbose) install -m 644 $(FC) $@
else else
$(verbose) install -m 644 $(FC) $(FCPATH) $(verbose) install -m 644 $(FC) $(FCPATH)
$(verbose) install -m 644 $(HOMEDIR_TEMPLATE) $(HOMEDIRPATH) $(verbose) install -m 644 $(HOMEDIR_TEMPLATE) $(HOMEDIRPATH)