diff options
| author |   Jason Zaman <jason@perfinion.com> | 2017-02-05 16:58:28 +0800 |
|---|---|---|
| committer | Jason Zaman <jason@perfinion.com> | 2017-02-05 23:10:31 +0800 |
| commit | a22e9f51496b244924b7103da65925d57e8603df (patch) | |
| tree | e546f39b1457586985fd96e08a43cf33df58d157 | |
| parent | Create / to /usr equivalence for bin, sbin, and lib, from Russell Coker. (diff) | |
| download | hardened-refpolicy-a22e9f51.tar.gz hardened-refpolicy-a22e9f51.tar.bz2 hardened-refpolicy-a22e9f51.zip | |
usrmerge: Add gentoo-specific /usr fcontexts
| -rw-r--r-- | policy/modules/system/fstools.fc | 1 | ||||
| -rw-r--r-- | policy/modules/system/init.fc | 6 | ||||
| -rw-r--r-- | policy/modules/system/lvm.fc | 4 | ||||
| -rw-r--r-- | policy/modules/system/sysnetwork.fc | 2 | ||||
| -rw-r--r-- | policy/modules/system/tmpfiles.fc | 4 | ||||
| -rw-r--r-- | policy/modules/system/udev.fc | 7 |
6 files changed, 10 insertions, 14 deletions
diff --git a/policy/modules/system/fstools.fc b/policy/modules/system/fstools.fc index 5249a7022..4dca3edf1 100644 --- a/policy/modules/system/fstools.fc +++ b/policy/modules/system/fstools.fc @@ -61,6 +61,5 @@ /run/fsck(/.*)? gen_context(system_u:object_r:fsadm_run_t,s0) ifdef(`distro_gentoo',` -/sbin/mkfs\.f2fs -- gen_context(system_u:object_r:fsadm_exec_t,s0) /usr/sbin/mkfs\.f2fs -- gen_context(system_u:object_r:fsadm_exec_t,s0) ') diff --git a/policy/modules/system/init.fc b/policy/modules/system/init.fc index 3e1365c72..19a953f9c 100644 --- a/policy/modules/system/init.fc +++ b/policy/modules/system/init.fc @@ -81,13 +81,13 @@ ifdef(`distro_gentoo',` # # /lib # -/lib/rc/console(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) -/lib/rc/cache(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) +/usr/lib/rc/console(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) +/usr/lib/rc/cache(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) # # /sbin # -/sbin/openrc -- gen_context(system_u:object_r:rc_exec_t,s0) +/usr/sbin/openrc -- gen_context(system_u:object_r:rc_exec_t,s0) # # /var diff --git a/policy/modules/system/lvm.fc b/policy/modules/system/lvm.fc index 8f4988e2f..3fc24cc04 100644 --- a/policy/modules/system/lvm.fc +++ b/policy/modules/system/lvm.fc @@ -100,9 +100,9 @@ ifdef(`distro_gentoo',` ifdef(`distro_gentoo',` # Bug 529430 comment 7 -/sbin/lvmetad -- gen_context(system_u:object_r:lvm_exec_t,s0) +/usr/sbin/lvmetad -- gen_context(system_u:object_r:lvm_exec_t,s0) /var/run/lvm(/.*)? gen_context(system_u:object_r:lvm_var_run_t,s0) # Bug 529430 comment 8 -/sbin/dmeventd -- gen_context(system_u:object_r:lvm_exec_t,s0) +/usr/sbin/dmeventd -- gen_context(system_u:object_r:lvm_exec_t,s0) ') diff --git a/policy/modules/system/sysnetwork.fc b/policy/modules/system/sysnetwork.fc index a295f4633..2c93c4109 100644 --- a/policy/modules/system/sysnetwork.fc +++ b/policy/modules/system/sysnetwork.fc @@ -72,7 +72,7 @@ ifdef(`distro_debian',` ') ifdef(`distro_gentoo',` -/lib/dhcpcd/dhcpcd-run-hooks -- gen_context(system_u:object_r:dhcpc_script_exec_t,s0) +/usr/lib/dhcpcd/dhcpcd-run-hooks -- gen_context(system_u:object_r:dhcpc_script_exec_t,s0) /var/run/dhcpcd\.sock -s gen_context(system_u:object_r:dhcpc_var_run_t,s0) /var/run/dhcpcd\.unpriv\.sock -s gen_context(system_u:object_r:dhcpc_var_run_t,s0) ') diff --git a/policy/modules/system/tmpfiles.fc b/policy/modules/system/tmpfiles.fc index 12fd30a62..3f9b2b881 100644 --- a/policy/modules/system/tmpfiles.fc +++ b/policy/modules/system/tmpfiles.fc @@ -2,6 +2,6 @@ /etc/tmpfiles.d(/.*)? gen_context(system_u:object_r:tmpfiles_conf_t,s0) /var/run/tmpfiles.d(/.*)? gen_context(system_u:object_r:tmpfiles_var_run_t,s0) -/lib/rc/bin/checkpath -- gen_context(system_u:object_r:tmpfiles_exec_t,s0) -/lib/rc/sh/tmpfiles.sh -- gen_context(system_u:object_r:tmpfiles_exec_t,s0) +/usr/lib/rc/bin/checkpath -- gen_context(system_u:object_r:tmpfiles_exec_t,s0) +/usr/lib/rc/sh/tmpfiles.sh -- gen_context(system_u:object_r:tmpfiles_exec_t,s0) diff --git a/policy/modules/system/udev.fc b/policy/modules/system/udev.fc index 6801d63fd..de646705e 100644 --- a/policy/modules/system/udev.fc +++ b/policy/modules/system/udev.fc @@ -42,11 +42,8 @@ ifdef(`distro_debian',` ') ifdef(`distro_gentoo',` -/bin/udevadm -- gen_context(system_u:object_r:udev_exec_t,s0) - -/lib/udev/udevd -- gen_context(system_u:object_r:udev_exec_t,s0) -/lib/udev/rules\.d(/.*)? gen_context(system_u:object_r:udev_rules_t,s0) -/lib/systemd/systemd-udevd -- gen_context(system_u:object_r:udev_exec_t,s0) +/usr/lib/udev/udevd -- gen_context(system_u:object_r:udev_exec_t,s0) +/usr/lib/udev/rules\.d(/.*)? gen_context(system_u:object_r:udev_rules_t,s0) /usr/bin/udevadm -- gen_context(system_u:object_r:udev_exec_t,s0) |