[selinux-policy: 766/3172] make DISTRO=redhat imply DIRECT_INITRC=y

Daniel J Walsh dwalsh at fedoraproject.org
Thu Oct 7 20:11:16 UTC 2010


commit 2b01ae7e2064847eb4656719e7b6cb47688fc533
Author: Chris PeBenito <cpebenito at tresys.com>
Date:   Thu Oct 20 18:08:31 2005 +0000

    make DISTRO=redhat imply DIRECT_INITRC=y

 refpolicy/Changelog |    2 ++
 refpolicy/Makefile  |    4 ++++
 2 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/refpolicy/Changelog b/refpolicy/Changelog
index 9c1d91f..463d1ab 100644
--- a/refpolicy/Changelog
+++ b/refpolicy/Changelog
@@ -1,3 +1,5 @@
+- DISTRO=redhat now implies DIRECT_INITRC=y.
+
 * Wed Oct 19 2005 Chris PeBenito <selinux at tresys.com> - 20051019
 - Many fixes to make loadable modules build.
 - Add targets for sechecker.
diff --git a/refpolicy/Makefile b/refpolicy/Makefile
index d01f739..bd60810 100644
--- a/refpolicy/Makefile
+++ b/refpolicy/Makefile
@@ -52,6 +52,7 @@ NAME = refpolicy
 # run init scripts, instead of requring run_init.
 # This is a build option, as role transitions do
 # not work in conditional policy.
+# This option will be impled as y for redhat policies.
 DIRECT_INITRC=n
 
 # Build monolithic policy.  Putting n here
@@ -141,6 +142,9 @@ endif
 # enable distribution-specific policy
 ifneq ($(DISTRO),)
 	override M4PARAM += -D distro_$(DISTRO)
+ifeq ($(DISTRO),redhat)
+	override DIRECT_INITRC := y
+endif
 endif
 
 ifneq ($(OUTPUT_POLICY),)


More information about the scm-commits mailing list