[selinux-policy: 459/3172] quiet the awk if modules.conf doesnt exist
Daniel J Walsh
dwalsh at fedoraproject.org
Thu Oct 7 19:44:22 UTC 2010
commit a3fdcebc6aea5ee677590de47b044b0cee9b6481
Author: Chris PeBenito <cpebenito at tresys.com>
Date: Wed Jul 6 15:24:45 2005 +0000
quiet the awk if modules.conf doesnt exist
refpolicy/Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/refpolicy/Makefile b/refpolicy/Makefile
index 0907be2..d6524b0 100644
--- a/refpolicy/Makefile
+++ b/refpolicy/Makefile
@@ -141,8 +141,8 @@ DETECTED_MODS := $(sort $(foreach dir,$(ALL_LAYERS),$(wildcard $(dir)/*.te)) $(G
MODBASE := base
MODMOD := module
-BASE_MODS := $(foreach mod,$(shell awk '/^[[:blank:]]*[[:alpha:]]/{ if ($$3 == "$(MODBASE)") print $$1 }' $(MOD_CONF)),$(subst ./,,$(shell find -iname $(mod).te)))
-MOD_MODS := $(foreach mod,$(shell awk '/^[[:blank:]]*[[:alpha:]]/{ if ($$3 == "$(MODMOD)") print $$1 }' $(MOD_CONF)),$(subst ./,,$(shell find -iname $(mod).te)))
+BASE_MODS := $(foreach mod,$(shell awk '/^[[:blank:]]*[[:alpha:]]/{ if ($$3 == "$(MODBASE)") print $$1 }' $(MOD_CONF) 2> /dev/null),$(subst ./,,$(shell find -iname $(mod).te)))
+MOD_MODS := $(foreach mod,$(shell awk '/^[[:blank:]]*[[:alpha:]]/{ if ($$3 == "$(MODMOD)") print $$1 }' $(MOD_CONF) 2> /dev/null),$(subst ./,,$(shell find -iname $(mod).te)))
# for monolithic policy use all base and module to create policy
# for modular policy, use only base
More information about the scm-commits
mailing list