* [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/, config/, policy/modules/system/, ...
@ 2017-01-01 16:36 Jason Zaman
0 siblings, 0 replies; only message in thread
From: Jason Zaman @ 2017-01-01 16:36 UTC (permalink / raw
To: gentoo-commits
commit: 04f212b3c1def7579e2f96aea8dc547c0c52e7dc
Author: cgzones <cgzones <AT> googlemail <DOT> com>
AuthorDate: Fri Dec 16 20:07:56 2016 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Jan 1 16:26:28 2017 +0000
URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=04f212b3
transition file contexts to /run
Remove file context aliases and update file context paths to use the /run filesystem path.
Add backward compatibility file context alias for /var/run using applications like https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=783321
Lock files are still seated at /var/lock
config/file_contexts.subs_dist | 7 +++++--
policy/modules/kernel/files.fc | 11 ++++++-----
policy/modules/kernel/filesystem.fc | 4 ++--
policy/modules/services/postgresql.fc | 4 ++--
policy/modules/services/ssh.fc | 6 +++---
policy/modules/services/xserver.fc | 20 +++++++++----------
policy/modules/system/authlogin.fc | 12 ++++++------
policy/modules/system/fstools.fc | 4 ++--
policy/modules/system/getty.fc | 4 ++--
policy/modules/system/hotplug.fc | 4 ++--
policy/modules/system/init.fc | 28 +++++++++++++--------------
policy/modules/system/ipsec.fc | 6 +++---
policy/modules/system/iptables.fc | 4 ++--
policy/modules/system/logging.fc | 36 +++++++++++++++++------------------
policy/modules/system/lvm.fc | 4 ++--
policy/modules/system/modutils.fc | 2 +-
policy/modules/system/mount.fc | 2 +-
policy/modules/system/selinuxutil.fc | 2 +-
policy/modules/system/setrans.fc | 2 +-
policy/modules/system/sysnetwork.fc | 6 +++---
policy/modules/system/systemd.fc | 16 ++++++++--------
policy/modules/system/udev.fc | 4 ++--
policy/modules/system/userdomain.fc | 10 +++++-----
23 files changed, 101 insertions(+), 97 deletions(-)
diff --git a/config/file_contexts.subs_dist b/config/file_contexts.subs_dist
index c7050e8..ade78dc 100644
--- a/config/file_contexts.subs_dist
+++ b/config/file_contexts.subs_dist
@@ -12,7 +12,6 @@
/lib/systemd /usr/lib/systemd
/lib32 /lib
/lib64 /lib
-/run /var/run
/run/lock /var/lock
/usr/lib32 /usr/lib
/usr/lib64 /usr/lib
@@ -20,4 +19,8 @@
/usr/local/lib64 /usr/lib
/usr/local/lib /usr/lib
/var/lib/krb5kdc /var/kerberos/krb5kdc
-/var/run/lock /var/lock
+
+# backward compatibility
+# not for refpolicy intern, but for /var/run using applications,
+# like systemd tmpfiles or systemd socket configurations
+/var/run /run
diff --git a/policy/modules/kernel/files.fc b/policy/modules/kernel/files.fc
index 3c61990..cc80d3f 100644
--- a/policy/modules/kernel/files.fc
+++ b/policy/modules/kernel/files.fc
@@ -165,9 +165,12 @@ ifdef(`distro_debian',`
# /run
#
/run -d gen_context(system_u:object_r:var_run_t,s0-mls_systemhigh)
+/run -l gen_context(system_u:object_r:var_run_t,s0)
/run/.* gen_context(system_u:object_r:var_run_t,s0)
/run/.*\.*pid <<none>>
-/run/lock(/.*)? gen_context(system_u:object_r:var_lock_t,s0)
+
+/run/lock -d gen_context(system_u:object_r:var_lock_t,s0)
+/run/lock -l gen_context(system_u:object_r:var_lock_t,s0)
#
# /selinux
@@ -258,8 +261,6 @@ ifndef(`distro_redhat',`
/var/run -d gen_context(system_u:object_r:var_run_t,s0-mls_systemhigh)
/var/run -l gen_context(system_u:object_r:var_run_t,s0)
-/var/run/.* gen_context(system_u:object_r:var_run_t,s0)
-/var/run/.*\.*pid <<none>>
/var/spool(/.*)? gen_context(system_u:object_r:var_spool_t,s0)
/var/spool/postfix/etc(/.*)? gen_context(system_u:object_r:etc_t,s0)
@@ -275,6 +276,6 @@ ifndef(`distro_redhat',`
/var/tmp/vi\.recover -d gen_context(system_u:object_r:tmp_t,s0)
ifdef(`distro_debian',`
-/var/run/motd -- gen_context(system_u:object_r:initrc_var_run_t,s0)
-/var/run/motd\.dynamic -- gen_context(system_u:object_r:initrc_var_run_t,s0)
+/run/motd -- gen_context(system_u:object_r:initrc_var_run_t,s0)
+/run/motd\.dynamic -- gen_context(system_u:object_r:initrc_var_run_t,s0)
')
diff --git a/policy/modules/kernel/filesystem.fc b/policy/modules/kernel/filesystem.fc
index f5cfe84..5228ab0 100644
--- a/policy/modules/kernel/filesystem.fc
+++ b/policy/modules/kernel/filesystem.fc
@@ -19,6 +19,6 @@
/sys/fs/pstore/.* <<none>>
ifdef(`distro_debian',`
-/var/run/shm -d gen_context(system_u:object_r:tmpfs_t,s0)
-/var/run/shm/.* <<none>>
+/run/shm -d gen_context(system_u:object_r:tmpfs_t,s0)
+/run/shm/.* <<none>>
')
diff --git a/policy/modules/services/postgresql.fc b/policy/modules/services/postgresql.fc
index d3bc4bb..d013468 100644
--- a/policy/modules/services/postgresql.fc
+++ b/policy/modules/services/postgresql.fc
@@ -51,6 +51,6 @@ ifdef(`distro_redhat', `
/var/log/rhdb/rhdb(/.*)? gen_context(system_u:object_r:postgresql_log_t,s0)
')
-/var/run/postgresql(/.*)? gen_context(system_u:object_r:postgresql_var_run_t,s0)
+/run/postgresql(/.*)? gen_context(system_u:object_r:postgresql_var_run_t,s0)
-/var/run/postmaster.* gen_context(system_u:object_r:postgresql_var_run_t,s0)
+/run/postmaster.* gen_context(system_u:object_r:postgresql_var_run_t,s0)
diff --git a/policy/modules/services/ssh.fc b/policy/modules/services/ssh.fc
index 027c8a8..71fd227 100644
--- a/policy/modules/services/ssh.fc
+++ b/policy/modules/services/ssh.fc
@@ -18,6 +18,6 @@ HOME_DIR/\.ssh(/.*)? gen_context(system_u:object_r:ssh_home_t,s0)
/usr/sbin/sshd -- gen_context(system_u:object_r:sshd_exec_t,s0)
-/var/run/sshd(/.*)? gen_context(system_u:object_r:sshd_var_run_t,s0)
-/var/run/sshd\.init\.pid -- gen_context(system_u:object_r:sshd_var_run_t,s0)
-/var/run/sshd\.pid -- gen_context(system_u:object_r:sshd_var_run_t,s0)
+/run/sshd(/.*)? gen_context(system_u:object_r:sshd_var_run_t,s0)
+/run/sshd\.init\.pid -- gen_context(system_u:object_r:sshd_var_run_t,s0)
+/run/sshd\.pid -- gen_context(system_u:object_r:sshd_var_run_t,s0)
diff --git a/policy/modules/services/xserver.fc b/policy/modules/services/xserver.fc
index 41b97e2..5b218c6 100644
--- a/policy/modules/services/xserver.fc
+++ b/policy/modules/services/xserver.fc
@@ -117,16 +117,16 @@ ifndef(`distro_debian',`
/var/log/XFree86.* -- gen_context(system_u:object_r:xserver_log_t,s0)
/var/log/Xorg.* -- gen_context(system_u:object_r:xserver_log_t,s0)
-/var/run/gdm(3)?(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0)
-/var/run/gdm(3)?\.pid -- gen_context(system_u:object_r:xdm_var_run_t,s0)
-/var/run/xdm\.pid -- gen_context(system_u:object_r:xdm_var_run_t,s0)
-/var/run/lightdm(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0)
-/var/run/lxdm\.auth -- gen_context(system_u:object_r:xdm_var_run_t,s0)
-/var/run/lxdm\.pid -- gen_context(system_u:object_r:xdm_var_run_t,s0)
-/var/run/lxdm(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0)
-/var/run/slim.* gen_context(system_u:object_r:xdm_var_run_t,s0)
-/var/run/xauth(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0)
-/var/run/xdmctl(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0)
+/run/gdm(3)?(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0)
+/run/gdm(3)?\.pid -- gen_context(system_u:object_r:xdm_var_run_t,s0)
+/run/xdm\.pid -- gen_context(system_u:object_r:xdm_var_run_t,s0)
+/run/lightdm(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0)
+/run/lxdm\.auth -- gen_context(system_u:object_r:xdm_var_run_t,s0)
+/run/lxdm\.pid -- gen_context(system_u:object_r:xdm_var_run_t,s0)
+/run/lxdm(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0)
+/run/slim.* gen_context(system_u:object_r:xdm_var_run_t,s0)
+/run/xauth(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0)
+/run/xdmctl(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0)
ifdef(`distro_suse',`
/var/lib/pam_devperm/:0 -- gen_context(system_u:object_r:xdm_var_lib_t,s0)
diff --git a/policy/modules/system/authlogin.fc b/policy/modules/system/authlogin.fc
index c0ee2e3..38a3775 100644
--- a/policy/modules/system/authlogin.fc
+++ b/policy/modules/system/authlogin.fc
@@ -41,11 +41,11 @@ ifdef(`distro_gentoo', `
/var/log/tallylog -- gen_context(system_u:object_r:faillog_t,s0)
/var/log/wtmp.* -- gen_context(system_u:object_r:wtmp_t,s0)
-/var/run/console(/.*)? gen_context(system_u:object_r:pam_var_console_t,s0)
-/var/run/faillock(/.*)? gen_context(system_u:object_r:faillog_t,s0)
-/var/run/pam_mount(/.*)? gen_context(system_u:object_r:pam_var_run_t,s0)
-/var/run/pam_ssh(/.*)? gen_context(system_u:object_r:var_auth_t,s0)
-/var/run/sepermit(/.*)? gen_context(system_u:object_r:pam_var_run_t,s0)
-/var/run/sudo(/.*)? gen_context(system_u:object_r:pam_var_run_t,s0)
+/run/console(/.*)? gen_context(system_u:object_r:pam_var_console_t,s0)
+/run/faillock(/.*)? gen_context(system_u:object_r:faillog_t,s0)
+/run/pam_mount(/.*)? gen_context(system_u:object_r:pam_var_run_t,s0)
+/run/pam_ssh(/.*)? gen_context(system_u:object_r:var_auth_t,s0)
+/run/sepermit(/.*)? gen_context(system_u:object_r:pam_var_run_t,s0)
+/run/sudo(/.*)? gen_context(system_u:object_r:pam_var_run_t,s0)
/var/(db|adm)/sudo(/.*)? gen_context(system_u:object_r:pam_var_run_t,s0)
/var/lib/sudo(/.*)? gen_context(system_u:object_r:pam_var_run_t,s0)
diff --git a/policy/modules/system/fstools.fc b/policy/modules/system/fstools.fc
index 9f3b9ca..adac903 100644
--- a/policy/modules/system/fstools.fc
+++ b/policy/modules/system/fstools.fc
@@ -63,8 +63,8 @@
/var/log/fsck(/.*)? gen_context(system_u:object_r:fsadm_log_t,s0)
-/var/run/blkid(/.*)? gen_context(system_u:object_r:fsadm_run_t,s0)
-/var/run/fsck(/.*)? gen_context(system_u:object_r:fsadm_run_t,s0)
+/run/blkid(/.*)? gen_context(system_u:object_r:fsadm_run_t,s0)
+/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)
diff --git a/policy/modules/system/getty.fc b/policy/modules/system/getty.fc
index 7bea727..56e25f3 100644
--- a/policy/modules/system/getty.fc
+++ b/policy/modules/system/getty.fc
@@ -6,8 +6,8 @@
/var/log/mgetty\.log.* -- gen_context(system_u:object_r:getty_log_t,s0)
/var/log/vgetty\.log\..* -- gen_context(system_u:object_r:getty_log_t,s0)
-/var/run/mgetty\.pid.* -- gen_context(system_u:object_r:getty_var_run_t,s0)
-/var/run/agetty\.reload -- gen_context(system_u:object_r:getty_var_run_t,s0)
+/run/mgetty\.pid.* -- gen_context(system_u:object_r:getty_var_run_t,s0)
+/run/agetty\.reload -- gen_context(system_u:object_r:getty_var_run_t,s0)
/var/spool/fax(/.*)? gen_context(system_u:object_r:getty_var_run_t,s0)
/var/spool/voice(/.*)? gen_context(system_u:object_r:getty_var_run_t,s0)
diff --git a/policy/modules/system/hotplug.fc b/policy/modules/system/hotplug.fc
index caf736b..0e686da 100644
--- a/policy/modules/system/hotplug.fc
+++ b/policy/modules/system/hotplug.fc
@@ -7,5 +7,5 @@
/sbin/hotplug -- gen_context(system_u:object_r:hotplug_exec_t,s0)
/sbin/netplugd -- gen_context(system_u:object_r:hotplug_exec_t,s0)
-/var/run/usb(/.*)? gen_context(system_u:object_r:hotplug_var_run_t,s0)
-/var/run/hotplug(/.*)? gen_context(system_u:object_r:hotplug_var_run_t,s0)
+/run/usb(/.*)? gen_context(system_u:object_r:hotplug_var_run_t,s0)
+/run/hotplug(/.*)? gen_context(system_u:object_r:hotplug_var_run_t,s0)
diff --git a/policy/modules/system/init.fc b/policy/modules/system/init.fc
index 3b15ac9..11f1b80 100644
--- a/policy/modules/system/init.fc
+++ b/policy/modules/system/init.fc
@@ -61,29 +61,29 @@ ifdef(`distro_gentoo', `
#
/var/lib/systemd(/.*)? gen_context(system_u:object_r:init_var_lib_t,s0)
-/var/run/initctl -p gen_context(system_u:object_r:initctl_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)
-/var/run/systemd(/.*)? gen_context(system_u:object_r:init_var_run_t,s0)
+/run/initctl -p gen_context(system_u:object_r:initctl_t,s0)
+/run/utmp -- gen_context(system_u:object_r:initrc_var_run_t,s0)
+/run/runlevel\.dir gen_context(system_u:object_r:initrc_var_run_t,s0)
+/run/random-seed -- gen_context(system_u:object_r:initrc_var_run_t,s0)
+/run/setmixer_flag -- gen_context(system_u:object_r:initrc_var_run_t,s0)
+/run/systemd(/.*)? gen_context(system_u:object_r:init_var_run_t,s0)
ifdef(`distro_debian',`
-/var/run/hotkey-setup -- gen_context(system_u:object_r:initrc_var_run_t,s0)
-/var/run/kdm/.* -- gen_context(system_u:object_r:initrc_var_run_t,s0)
+/run/hotkey-setup -- gen_context(system_u:object_r:initrc_var_run_t,s0)
+/run/kdm/.* -- 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)
+/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)
-/var/run/numlock-on -- gen_context(system_u:object_r:initrc_var_run_t,s0)
-/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)
+/run/bootsplashctl -p gen_context(system_u:object_r:initrc_var_run_t,s0)
+/run/keymap -- gen_context(system_u:object_r:initrc_var_run_t,s0)
+/run/numlock-on -- gen_context(system_u:object_r:initrc_var_run_t,s0)
+/run/setleds-on -- gen_context(system_u:object_r:initrc_var_run_t,s0)
+/run/sysconfig(/.*)? gen_context(system_u:object_r:initrc_var_run_t,s0)
')
ifdef(`distro_gentoo',`
diff --git a/policy/modules/system/ipsec.fc b/policy/modules/system/ipsec.fc
index d42b08e..d741318 100644
--- a/policy/modules/system/ipsec.fc
+++ b/policy/modules/system/ipsec.fc
@@ -55,6 +55,6 @@
/var/racoon(/.*)? gen_context(system_u:object_r:ipsec_var_run_t,s0)
-/var/run/charon\.(.*)? -- gen_context(system_u:object_r:ipsec_var_run_t,s0)
-/var/run/pluto(/.*)? gen_context(system_u:object_r:ipsec_var_run_t,s0)
-/var/run/racoon\.pid -- gen_context(system_u:object_r:ipsec_var_run_t,s0)
+/run/charon\.(.*)? -- gen_context(system_u:object_r:ipsec_var_run_t,s0)
+/run/pluto(/.*)? gen_context(system_u:object_r:ipsec_var_run_t,s0)
+/run/racoon\.pid -- gen_context(system_u:object_r:ipsec_var_run_t,s0)
diff --git a/policy/modules/system/iptables.fc b/policy/modules/system/iptables.fc
index 2b52e21..9e6aeb1 100644
--- a/policy/modules/system/iptables.fc
+++ b/policy/modules/system/iptables.fc
@@ -29,5 +29,5 @@
/usr/sbin/iptables-multi -- gen_context(system_u:object_r:iptables_exec_t,s0)
/usr/sbin/iptables-restore -- gen_context(system_u:object_r:iptables_exec_t,s0)
-/var/run/ebtables\.lock -- gen_context(system_u:object_r:iptables_var_run_t,s0)
-/var/run/xtables.* -- gen_context(system_u:object_r:iptables_var_run_t,s0)
+/run/ebtables\.lock -- gen_context(system_u:object_r:iptables_var_run_t,s0)
+/run/xtables.* -- gen_context(system_u:object_r:iptables_var_run_t,s0)
diff --git a/policy/modules/system/logging.fc b/policy/modules/system/logging.fc
index 16fd395..b9b62e4 100644
--- a/policy/modules/system/logging.fc
+++ b/policy/modules/system/logging.fc
@@ -60,24 +60,24 @@ ifdef(`distro_redhat',`
/var/named/chroot/dev/log -s gen_context(system_u:object_r:devlog_t,s0)
')
-/var/run/audit_events -s gen_context(system_u:object_r:auditd_var_run_t,mls_systemhigh)
-/var/run/audispd_events -s gen_context(system_u:object_r:audisp_var_run_t,mls_systemhigh)
-/var/run/auditd\.pid -- gen_context(system_u:object_r:auditd_var_run_t,mls_systemhigh)
-/var/run/auditd_sock -s gen_context(system_u:object_r:auditd_var_run_t,mls_systemhigh)
-/var/run/klogd\.pid -- gen_context(system_u:object_r:klogd_var_run_t,s0)
-/var/run/log -s gen_context(system_u:object_r:devlog_t,s0)
-/var/run/log -d gen_context(system_u:object_r:var_log_t,s0-mls_systemhigh)
-/var/run/log/journal(/.*)? gen_context(system_u:object_r:var_log_t,mls_systemhigh)
-/var/run/metalog\.pid -- gen_context(system_u:object_r:syslogd_var_run_t,s0)
-/var/run/rsyslogd\.pid -- gen_context(system_u:object_r:syslogd_var_run_t,mls_systemhigh)
-/var/run/syslogd\.pid -- gen_context(system_u:object_r:syslogd_var_run_t,mls_systemhigh)
-/var/run/syslog-ng.ctl -- gen_context(system_u:object_r:syslogd_var_run_t,s0)
-/var/run/syslog-ng\.pid -- gen_context(system_u:object_r:syslogd_var_run_t,mls_systemhigh)
-/var/run/syslog-ng(/.*)? gen_context(system_u:object_r:syslogd_var_run_t,s0)
-/var/run/systemd/journal(/.*)? gen_context(system_u:object_r:syslogd_var_run_t,mls_systemhigh)
-/var/run/systemd/journal/socket -s gen_context(system_u:object_r:devlog_t,mls_systemhigh)
-/var/run/systemd/journal/syslog -s gen_context(system_u:object_r:devlog_t,mls_systemhigh)
-/var/run/systemd/journal/dev-log -s gen_context(system_u:object_r:devlog_t,mls_systemhigh)
+/run/audit_events -s gen_context(system_u:object_r:auditd_var_run_t,mls_systemhigh)
+/run/audispd_events -s gen_context(system_u:object_r:audisp_var_run_t,mls_systemhigh)
+/run/auditd\.pid -- gen_context(system_u:object_r:auditd_var_run_t,mls_systemhigh)
+/run/auditd_sock -s gen_context(system_u:object_r:auditd_var_run_t,mls_systemhigh)
+/run/klogd\.pid -- gen_context(system_u:object_r:klogd_var_run_t,s0)
+/run/log -s gen_context(system_u:object_r:devlog_t,s0)
+/run/log -d gen_context(system_u:object_r:var_log_t,s0-mls_systemhigh)
+/run/log/journal(/.*)? gen_context(system_u:object_r:var_log_t,mls_systemhigh)
+/run/metalog\.pid -- gen_context(system_u:object_r:syslogd_var_run_t,s0)
+/run/rsyslogd\.pid -- gen_context(system_u:object_r:syslogd_var_run_t,mls_systemhigh)
+/run/syslogd\.pid -- gen_context(system_u:object_r:syslogd_var_run_t,mls_systemhigh)
+/run/syslog-ng.ctl -- gen_context(system_u:object_r:syslogd_var_run_t,s0)
+/run/syslog-ng\.pid -- gen_context(system_u:object_r:syslogd_var_run_t,mls_systemhigh)
+/run/syslog-ng(/.*)? gen_context(system_u:object_r:syslogd_var_run_t,s0)
+/run/systemd/journal(/.*)? gen_context(system_u:object_r:syslogd_var_run_t,mls_systemhigh)
+/run/systemd/journal/socket -s gen_context(system_u:object_r:devlog_t,mls_systemhigh)
+/run/systemd/journal/syslog -s gen_context(system_u:object_r:devlog_t,mls_systemhigh)
+/run/systemd/journal/dev-log -s gen_context(system_u:object_r:devlog_t,mls_systemhigh)
/var/spool/audit(/.*)? gen_context(system_u:object_r:audit_spool_t,mls_systemhigh)
/var/spool/bacula/log(/.*)? gen_context(system_u:object_r:var_log_t,s0)
diff --git a/policy/modules/system/lvm.fc b/policy/modules/system/lvm.fc
index 83782b0..5a39d46 100644
--- a/policy/modules/system/lvm.fc
+++ b/policy/modules/system/lvm.fc
@@ -109,8 +109,8 @@ ifdef(`distro_gentoo',`
/var/cache/multipathd(/.*)? gen_context(system_u:object_r:lvm_metadata_t,s0)
/var/lib/multipath(/.*)? gen_context(system_u:object_r:lvm_var_lib_t,s0)
/var/lock/lvm(/.*)? gen_context(system_u:object_r:lvm_lock_t,s0)
-/var/run/multipathd\.sock -s gen_context(system_u:object_r:lvm_var_run_t,s0)
-/var/run/dmevent.* gen_context(system_u:object_r:lvm_var_run_t,s0)
+/run/multipathd\.sock -s gen_context(system_u:object_r:lvm_var_run_t,s0)
+/run/dmevent.* gen_context(system_u:object_r:lvm_var_run_t,s0)
ifdef(`distro_gentoo',`
# Bug 529430 comment 7
diff --git a/policy/modules/system/modutils.fc b/policy/modules/system/modutils.fc
index 1fda13f..c146cc2 100644
--- a/policy/modules/system/modutils.fc
+++ b/policy/modules/system/modutils.fc
@@ -23,4 +23,4 @@ ifdef(`distro_gentoo',`
/sbin/update-modules -- gen_context(system_u:object_r:kmod_exec_t,s0)
/usr/bin/kmod -- gen_context(system_u:object_r:kmod_exec_t,s0)
-/var/run/tmpfiles\.d/kmod\.conf -- gen_context(system_u:object_r:kmod_var_run_t,s0)
+/run/tmpfiles\.d/kmod\.conf -- gen_context(system_u:object_r:kmod_var_run_t,s0)
diff --git a/policy/modules/system/mount.fc b/policy/modules/system/mount.fc
index 5f4f548..7844131 100644
--- a/policy/modules/system/mount.fc
+++ b/policy/modules/system/mount.fc
@@ -8,4 +8,4 @@
/usr/bin/fusermount -- gen_context(system_u:object_r:mount_exec_t,s0)
-/var/run/mount(/.*)? gen_context(system_u:object_r:mount_var_run_t,s0)
+/run/mount(/.*)? gen_context(system_u:object_r:mount_var_run_t,s0)
diff --git a/policy/modules/system/selinuxutil.fc b/policy/modules/system/selinuxutil.fc
index 771986f..e9c51b7 100644
--- a/policy/modules/system/selinuxutil.fc
+++ b/policy/modules/system/selinuxutil.fc
@@ -55,7 +55,7 @@
#
# /var/run
#
-/var/run/restorecond\.pid -- gen_context(system_u:object_r:restorecond_var_run_t,s0)
+/run/restorecond\.pid -- gen_context(system_u:object_r:restorecond_var_run_t,s0)
ifdef(`distro_gentoo',`
# Support for gentoo python switcheridoo
diff --git a/policy/modules/system/setrans.fc b/policy/modules/system/setrans.fc
index 094ef22..837beab 100644
--- a/policy/modules/system/setrans.fc
+++ b/policy/modules/system/setrans.fc
@@ -4,4 +4,4 @@
/usr/lib/systemd/system/mcstrans.*\.service -- gen_context(system_u:object_r:setrans_unit_t,s0)
-/var/run/setrans(/.*)? gen_context(system_u:object_r:setrans_var_run_t,mls_systemhigh)
+/run/setrans(/.*)? gen_context(system_u:object_r:setrans_var_run_t,mls_systemhigh)
diff --git a/policy/modules/system/sysnetwork.fc b/policy/modules/system/sysnetwork.fc
index d9b674e..02980cb 100644
--- a/policy/modules/system/sysnetwork.fc
+++ b/policy/modules/system/sysnetwork.fc
@@ -69,15 +69,15 @@ ifdef(`distro_redhat',`
/var/lib/dhclient(/.*)? gen_context(system_u:object_r:dhcpc_state_t,s0)
/var/lib/wifiroamd(/.*)? gen_context(system_u:object_r:dhcpc_state_t,s0)
-/var/run/dhclient.* -- gen_context(system_u:object_r:dhcpc_var_run_t,s0)
-/var/run/dhcpcd(/.*)? gen_context(system_u:object_r:dhcpc_var_run_t,s0)
+/run/dhclient.* -- gen_context(system_u:object_r:dhcpc_var_run_t,s0)
+/run/dhcpcd(/.*)? gen_context(system_u:object_r:dhcpc_var_run_t,s0)
ifdef(`distro_gentoo',`
/var/lib/dhcpc(/.*)? gen_context(system_u:object_r:dhcpc_state_t,s0)
')
ifdef(`distro_debian',`
-/var/run/network(/.*)? gen_context(system_u:object_r:net_conf_t,s0)
+/run/network(/.*)? gen_context(system_u:object_r:net_conf_t,s0)
')
ifdef(`distro_gentoo',`
diff --git a/policy/modules/system/systemd.fc b/policy/modules/system/systemd.fc
index a987681..ff0f976 100644
--- a/policy/modules/system/systemd.fc
+++ b/policy/modules/system/systemd.fc
@@ -31,12 +31,12 @@
/var/lib/systemd/linger(/.*)? gen_context(system_u:object_r:systemd_logind_var_lib_t,s0)
-/var/run/\.nologin[^/]* -- gen_context(system_u:object_r:systemd_sessions_var_run_t,s0)
-/var/run/nologin -- gen_context(system_u:object_r:systemd_sessions_var_run_t,s0)
+/run/\.nologin[^/]* -- gen_context(system_u:object_r:systemd_sessions_var_run_t,s0)
+/run/nologin -- gen_context(system_u:object_r:systemd_sessions_var_run_t,s0)
-/var/run/systemd/resolve(/.*)? gen_context(system_u:object_r:systemd_resolved_var_run_t,s0)
-/var/run/systemd/seats(/.*)? gen_context(system_u:object_r:systemd_logind_var_run_t,s0)
-/var/run/systemd/sessions(/.*)? gen_context(system_u:object_r:systemd_logind_var_run_t,s0)
-/var/run/systemd/users(/.*)? gen_context(system_u:object_r:systemd_logind_var_run_t,s0)
-/var/run/systemd/inhibit(/.*)? gen_context(system_u:object_r:systemd_logind_var_run_t,s0)
-/var/run/tmpfiles\.d/kmod.conf gen_context(system_u:object_r:systemd_kmod_conf_t,s0)
+/run/systemd/resolve(/.*)? gen_context(system_u:object_r:systemd_resolved_var_run_t,s0)
+/run/systemd/seats(/.*)? gen_context(system_u:object_r:systemd_logind_var_run_t,s0)
+/run/systemd/sessions(/.*)? gen_context(system_u:object_r:systemd_logind_var_run_t,s0)
+/run/systemd/users(/.*)? gen_context(system_u:object_r:systemd_logind_var_run_t,s0)
+/run/systemd/inhibit(/.*)? gen_context(system_u:object_r:systemd_logind_var_run_t,s0)
+/run/tmpfiles\.d/kmod.conf gen_context(system_u:object_r:systemd_kmod_conf_t,s0)
diff --git a/policy/modules/system/udev.fc b/policy/modules/system/udev.fc
index 8d414c1..00cfe14 100644
--- a/policy/modules/system/udev.fc
+++ b/policy/modules/system/udev.fc
@@ -33,11 +33,11 @@ ifdef(`distro_redhat',`
/usr/share/virtualbox/VBoxCreateUSBNode\.sh -- gen_context(system_u:object_r:udev_helper_exec_t,s0)
-/var/run/udev(/.*)? gen_context(system_u:object_r:udev_var_run_t,s0)
+/run/udev(/.*)? gen_context(system_u:object_r:udev_var_run_t,s0)
ifdef(`distro_debian',`
/lib/systemd/systemd-udevd -- gen_context(system_u:object_r:udev_exec_t,s0)
-/var/run/xen-hotplug -d gen_context(system_u:object_r:udev_var_run_t,s0)
+/run/xen-hotplug -d gen_context(system_u:object_r:udev_var_run_t,s0)
')
ifdef(`distro_gentoo',`
diff --git a/policy/modules/system/userdomain.fc b/policy/modules/system/userdomain.fc
index 0214d21..c8b881e 100644
--- a/policy/modules/system/userdomain.fc
+++ b/policy/modules/system/userdomain.fc
@@ -4,9 +4,9 @@ HOME_DIR/\.pki(/.*)? gen_context(system_u:object_r:user_cert_t,s0)
/tmp/gconfd-USER -d gen_context(system_u:object_r:user_tmp_t,s0)
-/var/run/user -d gen_context(system_u:object_r:user_runtime_root_t,s0)
-/var/run/user/[^/]+ -d gen_context(system_u:object_r:user_runtime_t,s0)
-/var/run/user/[^/]+/.+ -d <<none>>
+/run/user -d gen_context(system_u:object_r:user_runtime_root_t,s0)
+/run/user/[^/]+ -d gen_context(system_u:object_r:user_runtime_t,s0)
+/run/user/[^/]+/.+ -d <<none>>
# new genhomedircon required for these patterns
-/var/run/user/%{USERID} -d gen_context(system_u:object_r:user_runtime_t,s0)
-/var/run/user/%{USERID}/.+ <<none>>
+/run/user/%{USERID} -d gen_context(system_u:object_r:user_runtime_t,s0)
+/run/user/%{USERID}/.+ <<none>>
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2017-01-01 16:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-01 16:36 [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/, config/, policy/modules/system/, Jason Zaman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox