commit: ed34f2a2082007b98285bafc17bc33f110270804 Author: Jason Zaman <jason <AT> perfinion <DOT> com> AuthorDate: Sun Feb 5 08:08:00 2017 +0000 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> CommitDate: Sun Feb 5 15:10:31 2017 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=ed34f2a2
contrib: usrmerge: Add gentoo-specific /usr fcontexts policy/modules/contrib/nut.fc | 2 +- policy/modules/contrib/openrc.fc | 2 +- policy/modules/contrib/resolvconf.fc | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/policy/modules/contrib/nut.fc b/policy/modules/contrib/nut.fc index 5fa41e6..fdf658f 100644 --- a/policy/modules/contrib/nut.fc +++ b/policy/modules/contrib/nut.fc @@ -19,5 +19,5 @@ /var/www/nut-cgi-bin/upsstats\.cgi -- gen_context(system_u:object_r:httpd_nutups_cgi_script_exec_t,s0) ifdef(`distro_gentoo',` -/lib/nut/upsdrvctl -- gen_context(system_u:object_r:nut_upsdrvctl_exec_t,s0) +/usr/lib/nut/upsdrvctl -- gen_context(system_u:object_r:nut_upsdrvctl_exec_t,s0) ') diff --git a/policy/modules/contrib/openrc.fc b/policy/modules/contrib/openrc.fc index 25c063f..7d62191 100644 --- a/policy/modules/contrib/openrc.fc +++ b/policy/modules/contrib/openrc.fc @@ -1 +1 @@ -/lib/rc/sh/cgroup-release-agent.sh -- gen_context(system_u:object_r:openrc_cgroup_release_exec_t,s0) +/usr/lib/rc/sh/cgroup-release-agent.sh -- gen_context(system_u:object_r:openrc_cgroup_release_exec_t,s0) diff --git a/policy/modules/contrib/resolvconf.fc b/policy/modules/contrib/resolvconf.fc index e6a410f..7db4cb8 100644 --- a/policy/modules/contrib/resolvconf.fc +++ b/policy/modules/contrib/resolvconf.fc @@ -1,8 +1,7 @@ - /etc/resolvconf.conf -- gen_context(system_u:object_r:resolvconf_conf_t,s0) -/lib/resolvconf(/.*)? gen_context(system_u:object_r:bin_t,s0) +/usr/lib/resolvconf(/.*)? gen_context(system_u:object_r:bin_t,s0) -/sbin/resolvconf -- gen_context(system_u:object_r:resolvconf_exec_t,s0) +/usr/sbin/resolvconf -- gen_context(system_u:object_r:resolvconf_exec_t,s0) /var/run/resolvconf(/.*)? gen_context(system_u:object_r:resolvconf_var_run_t,s0)
