From 0233fc5126b21ed664da366001249ac16df3d5a9 Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Wed, 15 Dec 2010 14:48:43 -0500 Subject: [PATCH] Rearrange distro blocks in init.fc --- policy/modules/system/init.fc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/policy/modules/system/init.fc b/policy/modules/system/init.fc index d79f336db..6fed22ce5 100644 --- a/policy/modules/system/init.fc +++ b/policy/modules/system/init.fc @@ -21,6 +21,15 @@ ifdef(`distro_gentoo',` # /dev/initctl -p gen_context(system_u:object_r:initctl_t,s0) +# +# /lib +# +ifdef(`distro_gentoo', ` +/lib/rc/init\.d(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) +/lib32/rc/init\.d(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) +/lib64/rc/init\.d(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) +') + # # /sbin # @@ -48,16 +57,16 @@ ifdef(`distro_gentoo', ` # # /var # -ifdef(`distro_gentoo', ` -/var/lib/init\.d(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) -/var/run/svscan\.pid -- gen_context(system_u:object_r:initrc_var_run_t,s0) -') - /var/run/utmp -- gen_context(system_u:object_r:initrc_var_run_t,s0) /var/run/runlevel\.dir gen_context(system_u:object_r:initrc_var_run_t,s0) /var/run/random-seed -- gen_context(system_u:object_r:initrc_var_run_t,s0) /var/run/setmixer_flag -- gen_context(system_u:object_r:initrc_var_run_t,s0) +ifdef(`distro_gentoo', ` +/var/lib/init\.d(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) +/var/run/svscan\.pid -- gen_context(system_u:object_r:initrc_var_run_t,s0) +') + ifdef(`distro_suse', ` /var/run/bootsplashctl -p gen_context(system_u:object_r:initrc_var_run_t,s0) /var/run/keymap -- gen_context(system_u:object_r:initrc_var_run_t,s0) @@ -65,12 +74,3 @@ 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) ') - -# -# /lib -# -ifdef(`distro_gentoo', ` -/lib/rc/init\.d(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) -/lib32/rc/init\.d(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) -/lib64/rc/init\.d(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) -')