diff --git a/policy/modules/admin/portage.fc b/policy/modules/admin/portage.fc index af2d51fe5..60b9752a5 100644 --- a/policy/modules/admin/portage.fc +++ b/policy/modules/admin/portage.fc @@ -9,7 +9,7 @@ /usr/lib(64)?/portage/bin/ebuild -- gen_context(system_u:object_r:portage_exec_t,s0) /usr/lib(64)?/portage/bin/emerge -- gen_context(system_u:object_r:portage_exec_t,s0) -/usr/lib(64)?/portage/bin/emerge-webrsync -- gen_context(system_u:object_r:portage_fetch_exec_t,s0) +/usr/lib(64)?/portage/bin/emerge-webrsync -- gen_context(system_u:object_r:portage_fetch_exec_t,s0) /usr/lib(64)?/portage/bin/quickpkg -- gen_context(system_u:object_r:portage_exec_t,s0) /usr/lib(64)?/portage/bin/ebuild\.sh -- gen_context(system_u:object_r:portage_exec_t,s0) /usr/lib(64)?/portage/bin/regenworld -- gen_context(system_u:object_r:portage_exec_t,s0) diff --git a/policy/modules/admin/portage.te b/policy/modules/admin/portage.te index 3de3245c8..878c6cb9e 100644 --- a/policy/modules/admin/portage.te +++ b/policy/modules/admin/portage.te @@ -7,12 +7,11 @@ policy_module(portage, 1.11.1) ## ##

-## Allow the portage domains to use NFS mounts (regular nfs_t) +## Allow the portage domains to use NFS mounts (regular nfs_t) ##

##
gen_tunable(portage_use_nfs, false) - type gcc_config_t; type gcc_config_exec_t; application_domain(gcc_config_t, gcc_config_exec_t) @@ -250,7 +249,6 @@ manage_dirs_pattern(portage_fetch_t, portage_fetch_tmp_t, portage_fetch_tmp_t) manage_files_pattern(portage_fetch_t, portage_fetch_tmp_t, portage_fetch_tmp_t) files_tmp_filetrans(portage_fetch_t, portage_fetch_tmp_t, { file dir }) - kernel_read_system_state(portage_fetch_t) kernel_read_kernel_sysctls(portage_fetch_t) @@ -296,7 +294,6 @@ sysnet_dns_name_resolve(portage_fetch_t) userdom_use_user_terminals(portage_fetch_t) userdom_dontaudit_read_user_home_content_files(portage_fetch_t) - rsync_exec(portage_fetch_t) ifdef(`hide_broken_symptoms',` diff --git a/policy/modules/system/init.if b/policy/modules/system/init.if index 09fc86f8f..7fc677f88 100644 --- a/policy/modules/system/init.if +++ b/policy/modules/system/init.if @@ -459,13 +459,13 @@ interface(`init_exec',` ## ## ##

-## This is only applicable to Gentoo or distributions that use the OpenRC -## init system. +## This is only applicable to Gentoo or distributions that use the OpenRC +## init system. ##

##

-## The OpenRC /sbin/rc binary is used for both init scripts as well as -## management applications and tools. When used for management purposes, -## calling /sbin/rc should never cause a transition to initrc_t. +## The OpenRC /sbin/rc binary is used for both init scripts as well as +## management applications and tools. When used for management purposes, +## calling /sbin/rc should never cause a transition to initrc_t. ##

##
## @@ -813,6 +813,7 @@ interface(`init_spec_domtrans_script',` gen_require(` type rc_exec_t; ') + domtrans_pattern($1, rc_exec_t, initrc_t) ') diff --git a/policy/modules/system/init.te b/policy/modules/system/init.te index ff809bf1d..483865ee6 100644 --- a/policy/modules/system/init.te +++ b/policy/modules/system/init.te @@ -86,7 +86,6 @@ ifdef(`enable_mls',` kernel_ranged_domtrans_to(init_t, init_exec_t, s0 - mls_systemhigh) ') - ######################################## # # Init local policy