commit:     b345de50c6447626549e0865831175f1f2ec85de
Author:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
AuthorDate: Sat Sep 13 09:33:45 2014 +0000
Commit:     Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Sat Sep 13 09:33:45 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=b345de50

Move gentoo specifics downward for faster merging

---
 policy/modules/system/init.fc | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/policy/modules/system/init.fc b/policy/modules/system/init.fc
index e499287..b4391ce 100644
--- a/policy/modules/system/init.fc
+++ b/policy/modules/system/init.fc
@@ -26,7 +26,6 @@ ifdef(`distro_gentoo',`
 
 ifdef(`distro_gentoo', `
 /lib/rc/init\.d(/.*)?          gen_context(system_u:object_r:initrc_state_t,s0)
-/lib/rc/console(/.*)?          gen_context(system_u:object_r:initrc_state_t,s0)
 ')
 
 #
@@ -38,7 +37,6 @@ ifdef(`distro_gentoo', `
 
 ifdef(`distro_gentoo', `
 /sbin/rc               --      gen_context(system_u:object_r:rc_exec_t,s0)
-/sbin/openrc           --      gen_context(system_u:object_r:rc_exec_t,s0)
 ')
 
 #
@@ -46,7 +44,7 @@ ifdef(`distro_gentoo', `
 #
 /usr/bin/sepg_ctl      --      gen_context(system_u:object_r:initrc_exec_t,s0)
 
-/usr/lib/systemd/systemd       --      
gen_context(system_u:object_r:init_exec_t,s0)
+/usr/lib/systemd/systemd --    gen_context(system_u:object_r:init_exec_t,s0)
 
 /usr/libexec/dcc/start-.* --   gen_context(system_u:object_r:initrc_exec_t,s0)
 /usr/libexec/dcc/stop-.* --    gen_context(system_u:object_r:initrc_exec_t,s0)
@@ -73,9 +71,7 @@ ifdef(`distro_debian',`
 
 ifdef(`distro_gentoo', `
 /var/lib/init\.d(/.*)?         gen_context(system_u:object_r:initrc_state_t,s0)
-/var/lib/ip6?tables(/.*)?              
gen_context(system_u:object_r:initrc_tmp_t,s0)
 /var/run/svscan\.pid   --      
gen_context(system_u:object_r:initrc_var_run_t,s0)
-/var/run/openrc(/.*)?          gen_context(system_u:object_r:initrc_state_t,s0)
 ')
 
 ifdef(`distro_suse', `
@@ -85,3 +81,22 @@ ifdef(`distro_suse', `
 /var/run/setleds-on    --      
gen_context(system_u:object_r:initrc_var_run_t,s0)
 /var/run/sysconfig(/.*)?       
gen_context(system_u:object_r:initrc_var_run_t,s0)
 ')
+
+ifdef(`distro_gentoo',`
+# 
+# /lib
+#
+/lib/rc/console(/.*)?          gen_context(system_u:object_r:initrc_state_t,s0)
+
+#
+# /sbin
+#
+/sbin/openrc           --      gen_context(system_u:object_r:rc_exec_t,s0)
+
+#
+# /var
+#
+/var/lib/ip6?tables(/.*)?              
gen_context(system_u:object_r:initrc_tmp_t,s0)
+
+/var/run/openrc(/.*)?          gen_context(system_u:object_r:initrc_state_t,s0)
+')

Reply via email to