1 |
commit: 04f212b3c1def7579e2f96aea8dc547c0c52e7dc |
2 |
Author: cgzones <cgzones <AT> googlemail <DOT> com> |
3 |
AuthorDate: Fri Dec 16 20:07:56 2016 +0000 |
4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 1 16:26:28 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=04f212b3 |
7 |
|
8 |
transition file contexts to /run |
9 |
|
10 |
Remove file context aliases and update file context paths to use the /run filesystem path. |
11 |
Add backward compatibility file context alias for /var/run using applications like https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=783321 |
12 |
Lock files are still seated at /var/lock |
13 |
|
14 |
config/file_contexts.subs_dist | 7 +++++-- |
15 |
policy/modules/kernel/files.fc | 11 ++++++----- |
16 |
policy/modules/kernel/filesystem.fc | 4 ++-- |
17 |
policy/modules/services/postgresql.fc | 4 ++-- |
18 |
policy/modules/services/ssh.fc | 6 +++--- |
19 |
policy/modules/services/xserver.fc | 20 +++++++++---------- |
20 |
policy/modules/system/authlogin.fc | 12 ++++++------ |
21 |
policy/modules/system/fstools.fc | 4 ++-- |
22 |
policy/modules/system/getty.fc | 4 ++-- |
23 |
policy/modules/system/hotplug.fc | 4 ++-- |
24 |
policy/modules/system/init.fc | 28 +++++++++++++-------------- |
25 |
policy/modules/system/ipsec.fc | 6 +++--- |
26 |
policy/modules/system/iptables.fc | 4 ++-- |
27 |
policy/modules/system/logging.fc | 36 +++++++++++++++++------------------ |
28 |
policy/modules/system/lvm.fc | 4 ++-- |
29 |
policy/modules/system/modutils.fc | 2 +- |
30 |
policy/modules/system/mount.fc | 2 +- |
31 |
policy/modules/system/selinuxutil.fc | 2 +- |
32 |
policy/modules/system/setrans.fc | 2 +- |
33 |
policy/modules/system/sysnetwork.fc | 6 +++--- |
34 |
policy/modules/system/systemd.fc | 16 ++++++++-------- |
35 |
policy/modules/system/udev.fc | 4 ++-- |
36 |
policy/modules/system/userdomain.fc | 10 +++++----- |
37 |
23 files changed, 101 insertions(+), 97 deletions(-) |
38 |
|
39 |
diff --git a/config/file_contexts.subs_dist b/config/file_contexts.subs_dist |
40 |
index c7050e8..ade78dc 100644 |
41 |
--- a/config/file_contexts.subs_dist |
42 |
+++ b/config/file_contexts.subs_dist |
43 |
@@ -12,7 +12,6 @@ |
44 |
/lib/systemd /usr/lib/systemd |
45 |
/lib32 /lib |
46 |
/lib64 /lib |
47 |
-/run /var/run |
48 |
/run/lock /var/lock |
49 |
/usr/lib32 /usr/lib |
50 |
/usr/lib64 /usr/lib |
51 |
@@ -20,4 +19,8 @@ |
52 |
/usr/local/lib64 /usr/lib |
53 |
/usr/local/lib /usr/lib |
54 |
/var/lib/krb5kdc /var/kerberos/krb5kdc |
55 |
-/var/run/lock /var/lock |
56 |
+ |
57 |
+# backward compatibility |
58 |
+# not for refpolicy intern, but for /var/run using applications, |
59 |
+# like systemd tmpfiles or systemd socket configurations |
60 |
+/var/run /run |
61 |
|
62 |
diff --git a/policy/modules/kernel/files.fc b/policy/modules/kernel/files.fc |
63 |
index 3c61990..cc80d3f 100644 |
64 |
--- a/policy/modules/kernel/files.fc |
65 |
+++ b/policy/modules/kernel/files.fc |
66 |
@@ -165,9 +165,12 @@ ifdef(`distro_debian',` |
67 |
# /run |
68 |
# |
69 |
/run -d gen_context(system_u:object_r:var_run_t,s0-mls_systemhigh) |
70 |
+/run -l gen_context(system_u:object_r:var_run_t,s0) |
71 |
/run/.* gen_context(system_u:object_r:var_run_t,s0) |
72 |
/run/.*\.*pid <<none>> |
73 |
-/run/lock(/.*)? gen_context(system_u:object_r:var_lock_t,s0) |
74 |
+ |
75 |
+/run/lock -d gen_context(system_u:object_r:var_lock_t,s0) |
76 |
+/run/lock -l gen_context(system_u:object_r:var_lock_t,s0) |
77 |
|
78 |
# |
79 |
# /selinux |
80 |
@@ -258,8 +261,6 @@ ifndef(`distro_redhat',` |
81 |
|
82 |
/var/run -d gen_context(system_u:object_r:var_run_t,s0-mls_systemhigh) |
83 |
/var/run -l gen_context(system_u:object_r:var_run_t,s0) |
84 |
-/var/run/.* gen_context(system_u:object_r:var_run_t,s0) |
85 |
-/var/run/.*\.*pid <<none>> |
86 |
|
87 |
/var/spool(/.*)? gen_context(system_u:object_r:var_spool_t,s0) |
88 |
/var/spool/postfix/etc(/.*)? gen_context(system_u:object_r:etc_t,s0) |
89 |
@@ -275,6 +276,6 @@ ifndef(`distro_redhat',` |
90 |
/var/tmp/vi\.recover -d gen_context(system_u:object_r:tmp_t,s0) |
91 |
|
92 |
ifdef(`distro_debian',` |
93 |
-/var/run/motd -- gen_context(system_u:object_r:initrc_var_run_t,s0) |
94 |
-/var/run/motd\.dynamic -- gen_context(system_u:object_r:initrc_var_run_t,s0) |
95 |
+/run/motd -- gen_context(system_u:object_r:initrc_var_run_t,s0) |
96 |
+/run/motd\.dynamic -- gen_context(system_u:object_r:initrc_var_run_t,s0) |
97 |
') |
98 |
|
99 |
diff --git a/policy/modules/kernel/filesystem.fc b/policy/modules/kernel/filesystem.fc |
100 |
index f5cfe84..5228ab0 100644 |
101 |
--- a/policy/modules/kernel/filesystem.fc |
102 |
+++ b/policy/modules/kernel/filesystem.fc |
103 |
@@ -19,6 +19,6 @@ |
104 |
/sys/fs/pstore/.* <<none>> |
105 |
|
106 |
ifdef(`distro_debian',` |
107 |
-/var/run/shm -d gen_context(system_u:object_r:tmpfs_t,s0) |
108 |
-/var/run/shm/.* <<none>> |
109 |
+/run/shm -d gen_context(system_u:object_r:tmpfs_t,s0) |
110 |
+/run/shm/.* <<none>> |
111 |
') |
112 |
|
113 |
diff --git a/policy/modules/services/postgresql.fc b/policy/modules/services/postgresql.fc |
114 |
index d3bc4bb..d013468 100644 |
115 |
--- a/policy/modules/services/postgresql.fc |
116 |
+++ b/policy/modules/services/postgresql.fc |
117 |
@@ -51,6 +51,6 @@ ifdef(`distro_redhat', ` |
118 |
/var/log/rhdb/rhdb(/.*)? gen_context(system_u:object_r:postgresql_log_t,s0) |
119 |
') |
120 |
|
121 |
-/var/run/postgresql(/.*)? gen_context(system_u:object_r:postgresql_var_run_t,s0) |
122 |
+/run/postgresql(/.*)? gen_context(system_u:object_r:postgresql_var_run_t,s0) |
123 |
|
124 |
-/var/run/postmaster.* gen_context(system_u:object_r:postgresql_var_run_t,s0) |
125 |
+/run/postmaster.* gen_context(system_u:object_r:postgresql_var_run_t,s0) |
126 |
|
127 |
diff --git a/policy/modules/services/ssh.fc b/policy/modules/services/ssh.fc |
128 |
index 027c8a8..71fd227 100644 |
129 |
--- a/policy/modules/services/ssh.fc |
130 |
+++ b/policy/modules/services/ssh.fc |
131 |
@@ -18,6 +18,6 @@ HOME_DIR/\.ssh(/.*)? gen_context(system_u:object_r:ssh_home_t,s0) |
132 |
|
133 |
/usr/sbin/sshd -- gen_context(system_u:object_r:sshd_exec_t,s0) |
134 |
|
135 |
-/var/run/sshd(/.*)? gen_context(system_u:object_r:sshd_var_run_t,s0) |
136 |
-/var/run/sshd\.init\.pid -- gen_context(system_u:object_r:sshd_var_run_t,s0) |
137 |
-/var/run/sshd\.pid -- gen_context(system_u:object_r:sshd_var_run_t,s0) |
138 |
+/run/sshd(/.*)? gen_context(system_u:object_r:sshd_var_run_t,s0) |
139 |
+/run/sshd\.init\.pid -- gen_context(system_u:object_r:sshd_var_run_t,s0) |
140 |
+/run/sshd\.pid -- gen_context(system_u:object_r:sshd_var_run_t,s0) |
141 |
|
142 |
diff --git a/policy/modules/services/xserver.fc b/policy/modules/services/xserver.fc |
143 |
index 41b97e2..5b218c6 100644 |
144 |
--- a/policy/modules/services/xserver.fc |
145 |
+++ b/policy/modules/services/xserver.fc |
146 |
@@ -117,16 +117,16 @@ ifndef(`distro_debian',` |
147 |
/var/log/XFree86.* -- gen_context(system_u:object_r:xserver_log_t,s0) |
148 |
/var/log/Xorg.* -- gen_context(system_u:object_r:xserver_log_t,s0) |
149 |
|
150 |
-/var/run/gdm(3)?(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0) |
151 |
-/var/run/gdm(3)?\.pid -- gen_context(system_u:object_r:xdm_var_run_t,s0) |
152 |
-/var/run/xdm\.pid -- gen_context(system_u:object_r:xdm_var_run_t,s0) |
153 |
-/var/run/lightdm(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0) |
154 |
-/var/run/lxdm\.auth -- gen_context(system_u:object_r:xdm_var_run_t,s0) |
155 |
-/var/run/lxdm\.pid -- gen_context(system_u:object_r:xdm_var_run_t,s0) |
156 |
-/var/run/lxdm(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0) |
157 |
-/var/run/slim.* gen_context(system_u:object_r:xdm_var_run_t,s0) |
158 |
-/var/run/xauth(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0) |
159 |
-/var/run/xdmctl(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0) |
160 |
+/run/gdm(3)?(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0) |
161 |
+/run/gdm(3)?\.pid -- gen_context(system_u:object_r:xdm_var_run_t,s0) |
162 |
+/run/xdm\.pid -- gen_context(system_u:object_r:xdm_var_run_t,s0) |
163 |
+/run/lightdm(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0) |
164 |
+/run/lxdm\.auth -- gen_context(system_u:object_r:xdm_var_run_t,s0) |
165 |
+/run/lxdm\.pid -- gen_context(system_u:object_r:xdm_var_run_t,s0) |
166 |
+/run/lxdm(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0) |
167 |
+/run/slim.* gen_context(system_u:object_r:xdm_var_run_t,s0) |
168 |
+/run/xauth(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0) |
169 |
+/run/xdmctl(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0) |
170 |
|
171 |
ifdef(`distro_suse',` |
172 |
/var/lib/pam_devperm/:0 -- gen_context(system_u:object_r:xdm_var_lib_t,s0) |
173 |
|
174 |
diff --git a/policy/modules/system/authlogin.fc b/policy/modules/system/authlogin.fc |
175 |
index c0ee2e3..38a3775 100644 |
176 |
--- a/policy/modules/system/authlogin.fc |
177 |
+++ b/policy/modules/system/authlogin.fc |
178 |
@@ -41,11 +41,11 @@ ifdef(`distro_gentoo', ` |
179 |
/var/log/tallylog -- gen_context(system_u:object_r:faillog_t,s0) |
180 |
/var/log/wtmp.* -- gen_context(system_u:object_r:wtmp_t,s0) |
181 |
|
182 |
-/var/run/console(/.*)? gen_context(system_u:object_r:pam_var_console_t,s0) |
183 |
-/var/run/faillock(/.*)? gen_context(system_u:object_r:faillog_t,s0) |
184 |
-/var/run/pam_mount(/.*)? gen_context(system_u:object_r:pam_var_run_t,s0) |
185 |
-/var/run/pam_ssh(/.*)? gen_context(system_u:object_r:var_auth_t,s0) |
186 |
-/var/run/sepermit(/.*)? gen_context(system_u:object_r:pam_var_run_t,s0) |
187 |
-/var/run/sudo(/.*)? gen_context(system_u:object_r:pam_var_run_t,s0) |
188 |
+/run/console(/.*)? gen_context(system_u:object_r:pam_var_console_t,s0) |
189 |
+/run/faillock(/.*)? gen_context(system_u:object_r:faillog_t,s0) |
190 |
+/run/pam_mount(/.*)? gen_context(system_u:object_r:pam_var_run_t,s0) |
191 |
+/run/pam_ssh(/.*)? gen_context(system_u:object_r:var_auth_t,s0) |
192 |
+/run/sepermit(/.*)? gen_context(system_u:object_r:pam_var_run_t,s0) |
193 |
+/run/sudo(/.*)? gen_context(system_u:object_r:pam_var_run_t,s0) |
194 |
/var/(db|adm)/sudo(/.*)? gen_context(system_u:object_r:pam_var_run_t,s0) |
195 |
/var/lib/sudo(/.*)? gen_context(system_u:object_r:pam_var_run_t,s0) |
196 |
|
197 |
diff --git a/policy/modules/system/fstools.fc b/policy/modules/system/fstools.fc |
198 |
index 9f3b9ca..adac903 100644 |
199 |
--- a/policy/modules/system/fstools.fc |
200 |
+++ b/policy/modules/system/fstools.fc |
201 |
@@ -63,8 +63,8 @@ |
202 |
|
203 |
/var/log/fsck(/.*)? gen_context(system_u:object_r:fsadm_log_t,s0) |
204 |
|
205 |
-/var/run/blkid(/.*)? gen_context(system_u:object_r:fsadm_run_t,s0) |
206 |
-/var/run/fsck(/.*)? gen_context(system_u:object_r:fsadm_run_t,s0) |
207 |
+/run/blkid(/.*)? gen_context(system_u:object_r:fsadm_run_t,s0) |
208 |
+/run/fsck(/.*)? gen_context(system_u:object_r:fsadm_run_t,s0) |
209 |
|
210 |
ifdef(`distro_gentoo',` |
211 |
/sbin/mkfs\.f2fs -- gen_context(system_u:object_r:fsadm_exec_t,s0) |
212 |
|
213 |
diff --git a/policy/modules/system/getty.fc b/policy/modules/system/getty.fc |
214 |
index 7bea727..56e25f3 100644 |
215 |
--- a/policy/modules/system/getty.fc |
216 |
+++ b/policy/modules/system/getty.fc |
217 |
@@ -6,8 +6,8 @@ |
218 |
/var/log/mgetty\.log.* -- gen_context(system_u:object_r:getty_log_t,s0) |
219 |
/var/log/vgetty\.log\..* -- gen_context(system_u:object_r:getty_log_t,s0) |
220 |
|
221 |
-/var/run/mgetty\.pid.* -- gen_context(system_u:object_r:getty_var_run_t,s0) |
222 |
-/var/run/agetty\.reload -- gen_context(system_u:object_r:getty_var_run_t,s0) |
223 |
+/run/mgetty\.pid.* -- gen_context(system_u:object_r:getty_var_run_t,s0) |
224 |
+/run/agetty\.reload -- gen_context(system_u:object_r:getty_var_run_t,s0) |
225 |
|
226 |
/var/spool/fax(/.*)? gen_context(system_u:object_r:getty_var_run_t,s0) |
227 |
/var/spool/voice(/.*)? gen_context(system_u:object_r:getty_var_run_t,s0) |
228 |
|
229 |
diff --git a/policy/modules/system/hotplug.fc b/policy/modules/system/hotplug.fc |
230 |
index caf736b..0e686da 100644 |
231 |
--- a/policy/modules/system/hotplug.fc |
232 |
+++ b/policy/modules/system/hotplug.fc |
233 |
@@ -7,5 +7,5 @@ |
234 |
/sbin/hotplug -- gen_context(system_u:object_r:hotplug_exec_t,s0) |
235 |
/sbin/netplugd -- gen_context(system_u:object_r:hotplug_exec_t,s0) |
236 |
|
237 |
-/var/run/usb(/.*)? gen_context(system_u:object_r:hotplug_var_run_t,s0) |
238 |
-/var/run/hotplug(/.*)? gen_context(system_u:object_r:hotplug_var_run_t,s0) |
239 |
+/run/usb(/.*)? gen_context(system_u:object_r:hotplug_var_run_t,s0) |
240 |
+/run/hotplug(/.*)? gen_context(system_u:object_r:hotplug_var_run_t,s0) |
241 |
|
242 |
diff --git a/policy/modules/system/init.fc b/policy/modules/system/init.fc |
243 |
index 3b15ac9..11f1b80 100644 |
244 |
--- a/policy/modules/system/init.fc |
245 |
+++ b/policy/modules/system/init.fc |
246 |
@@ -61,29 +61,29 @@ ifdef(`distro_gentoo', ` |
247 |
# |
248 |
/var/lib/systemd(/.*)? gen_context(system_u:object_r:init_var_lib_t,s0) |
249 |
|
250 |
-/var/run/initctl -p gen_context(system_u:object_r:initctl_t,s0) |
251 |
-/var/run/utmp -- gen_context(system_u:object_r:initrc_var_run_t,s0) |
252 |
-/var/run/runlevel\.dir gen_context(system_u:object_r:initrc_var_run_t,s0) |
253 |
-/var/run/random-seed -- gen_context(system_u:object_r:initrc_var_run_t,s0) |
254 |
-/var/run/setmixer_flag -- gen_context(system_u:object_r:initrc_var_run_t,s0) |
255 |
-/var/run/systemd(/.*)? gen_context(system_u:object_r:init_var_run_t,s0) |
256 |
+/run/initctl -p gen_context(system_u:object_r:initctl_t,s0) |
257 |
+/run/utmp -- gen_context(system_u:object_r:initrc_var_run_t,s0) |
258 |
+/run/runlevel\.dir gen_context(system_u:object_r:initrc_var_run_t,s0) |
259 |
+/run/random-seed -- gen_context(system_u:object_r:initrc_var_run_t,s0) |
260 |
+/run/setmixer_flag -- gen_context(system_u:object_r:initrc_var_run_t,s0) |
261 |
+/run/systemd(/.*)? gen_context(system_u:object_r:init_var_run_t,s0) |
262 |
|
263 |
ifdef(`distro_debian',` |
264 |
-/var/run/hotkey-setup -- gen_context(system_u:object_r:initrc_var_run_t,s0) |
265 |
-/var/run/kdm/.* -- gen_context(system_u:object_r:initrc_var_run_t,s0) |
266 |
+/run/hotkey-setup -- gen_context(system_u:object_r:initrc_var_run_t,s0) |
267 |
+/run/kdm/.* -- gen_context(system_u:object_r:initrc_var_run_t,s0) |
268 |
') |
269 |
|
270 |
ifdef(`distro_gentoo', ` |
271 |
/var/lib/init\.d(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) |
272 |
-/var/run/svscan\.pid -- gen_context(system_u:object_r:initrc_var_run_t,s0) |
273 |
+/run/svscan\.pid -- gen_context(system_u:object_r:initrc_var_run_t,s0) |
274 |
') |
275 |
|
276 |
ifdef(`distro_suse', ` |
277 |
-/var/run/bootsplashctl -p gen_context(system_u:object_r:initrc_var_run_t,s0) |
278 |
-/var/run/keymap -- gen_context(system_u:object_r:initrc_var_run_t,s0) |
279 |
-/var/run/numlock-on -- gen_context(system_u:object_r:initrc_var_run_t,s0) |
280 |
-/var/run/setleds-on -- gen_context(system_u:object_r:initrc_var_run_t,s0) |
281 |
-/var/run/sysconfig(/.*)? gen_context(system_u:object_r:initrc_var_run_t,s0) |
282 |
+/run/bootsplashctl -p gen_context(system_u:object_r:initrc_var_run_t,s0) |
283 |
+/run/keymap -- gen_context(system_u:object_r:initrc_var_run_t,s0) |
284 |
+/run/numlock-on -- gen_context(system_u:object_r:initrc_var_run_t,s0) |
285 |
+/run/setleds-on -- gen_context(system_u:object_r:initrc_var_run_t,s0) |
286 |
+/run/sysconfig(/.*)? gen_context(system_u:object_r:initrc_var_run_t,s0) |
287 |
') |
288 |
|
289 |
ifdef(`distro_gentoo',` |
290 |
|
291 |
diff --git a/policy/modules/system/ipsec.fc b/policy/modules/system/ipsec.fc |
292 |
index d42b08e..d741318 100644 |
293 |
--- a/policy/modules/system/ipsec.fc |
294 |
+++ b/policy/modules/system/ipsec.fc |
295 |
@@ -55,6 +55,6 @@ |
296 |
|
297 |
/var/racoon(/.*)? gen_context(system_u:object_r:ipsec_var_run_t,s0) |
298 |
|
299 |
-/var/run/charon\.(.*)? -- gen_context(system_u:object_r:ipsec_var_run_t,s0) |
300 |
-/var/run/pluto(/.*)? gen_context(system_u:object_r:ipsec_var_run_t,s0) |
301 |
-/var/run/racoon\.pid -- gen_context(system_u:object_r:ipsec_var_run_t,s0) |
302 |
+/run/charon\.(.*)? -- gen_context(system_u:object_r:ipsec_var_run_t,s0) |
303 |
+/run/pluto(/.*)? gen_context(system_u:object_r:ipsec_var_run_t,s0) |
304 |
+/run/racoon\.pid -- gen_context(system_u:object_r:ipsec_var_run_t,s0) |
305 |
|
306 |
diff --git a/policy/modules/system/iptables.fc b/policy/modules/system/iptables.fc |
307 |
index 2b52e21..9e6aeb1 100644 |
308 |
--- a/policy/modules/system/iptables.fc |
309 |
+++ b/policy/modules/system/iptables.fc |
310 |
@@ -29,5 +29,5 @@ |
311 |
/usr/sbin/iptables-multi -- gen_context(system_u:object_r:iptables_exec_t,s0) |
312 |
/usr/sbin/iptables-restore -- gen_context(system_u:object_r:iptables_exec_t,s0) |
313 |
|
314 |
-/var/run/ebtables\.lock -- gen_context(system_u:object_r:iptables_var_run_t,s0) |
315 |
-/var/run/xtables.* -- gen_context(system_u:object_r:iptables_var_run_t,s0) |
316 |
+/run/ebtables\.lock -- gen_context(system_u:object_r:iptables_var_run_t,s0) |
317 |
+/run/xtables.* -- gen_context(system_u:object_r:iptables_var_run_t,s0) |
318 |
|
319 |
diff --git a/policy/modules/system/logging.fc b/policy/modules/system/logging.fc |
320 |
index 16fd395..b9b62e4 100644 |
321 |
--- a/policy/modules/system/logging.fc |
322 |
+++ b/policy/modules/system/logging.fc |
323 |
@@ -60,24 +60,24 @@ ifdef(`distro_redhat',` |
324 |
/var/named/chroot/dev/log -s gen_context(system_u:object_r:devlog_t,s0) |
325 |
') |
326 |
|
327 |
-/var/run/audit_events -s gen_context(system_u:object_r:auditd_var_run_t,mls_systemhigh) |
328 |
-/var/run/audispd_events -s gen_context(system_u:object_r:audisp_var_run_t,mls_systemhigh) |
329 |
-/var/run/auditd\.pid -- gen_context(system_u:object_r:auditd_var_run_t,mls_systemhigh) |
330 |
-/var/run/auditd_sock -s gen_context(system_u:object_r:auditd_var_run_t,mls_systemhigh) |
331 |
-/var/run/klogd\.pid -- gen_context(system_u:object_r:klogd_var_run_t,s0) |
332 |
-/var/run/log -s gen_context(system_u:object_r:devlog_t,s0) |
333 |
-/var/run/log -d gen_context(system_u:object_r:var_log_t,s0-mls_systemhigh) |
334 |
-/var/run/log/journal(/.*)? gen_context(system_u:object_r:var_log_t,mls_systemhigh) |
335 |
-/var/run/metalog\.pid -- gen_context(system_u:object_r:syslogd_var_run_t,s0) |
336 |
-/var/run/rsyslogd\.pid -- gen_context(system_u:object_r:syslogd_var_run_t,mls_systemhigh) |
337 |
-/var/run/syslogd\.pid -- gen_context(system_u:object_r:syslogd_var_run_t,mls_systemhigh) |
338 |
-/var/run/syslog-ng.ctl -- gen_context(system_u:object_r:syslogd_var_run_t,s0) |
339 |
-/var/run/syslog-ng\.pid -- gen_context(system_u:object_r:syslogd_var_run_t,mls_systemhigh) |
340 |
-/var/run/syslog-ng(/.*)? gen_context(system_u:object_r:syslogd_var_run_t,s0) |
341 |
-/var/run/systemd/journal(/.*)? gen_context(system_u:object_r:syslogd_var_run_t,mls_systemhigh) |
342 |
-/var/run/systemd/journal/socket -s gen_context(system_u:object_r:devlog_t,mls_systemhigh) |
343 |
-/var/run/systemd/journal/syslog -s gen_context(system_u:object_r:devlog_t,mls_systemhigh) |
344 |
-/var/run/systemd/journal/dev-log -s gen_context(system_u:object_r:devlog_t,mls_systemhigh) |
345 |
+/run/audit_events -s gen_context(system_u:object_r:auditd_var_run_t,mls_systemhigh) |
346 |
+/run/audispd_events -s gen_context(system_u:object_r:audisp_var_run_t,mls_systemhigh) |
347 |
+/run/auditd\.pid -- gen_context(system_u:object_r:auditd_var_run_t,mls_systemhigh) |
348 |
+/run/auditd_sock -s gen_context(system_u:object_r:auditd_var_run_t,mls_systemhigh) |
349 |
+/run/klogd\.pid -- gen_context(system_u:object_r:klogd_var_run_t,s0) |
350 |
+/run/log -s gen_context(system_u:object_r:devlog_t,s0) |
351 |
+/run/log -d gen_context(system_u:object_r:var_log_t,s0-mls_systemhigh) |
352 |
+/run/log/journal(/.*)? gen_context(system_u:object_r:var_log_t,mls_systemhigh) |
353 |
+/run/metalog\.pid -- gen_context(system_u:object_r:syslogd_var_run_t,s0) |
354 |
+/run/rsyslogd\.pid -- gen_context(system_u:object_r:syslogd_var_run_t,mls_systemhigh) |
355 |
+/run/syslogd\.pid -- gen_context(system_u:object_r:syslogd_var_run_t,mls_systemhigh) |
356 |
+/run/syslog-ng.ctl -- gen_context(system_u:object_r:syslogd_var_run_t,s0) |
357 |
+/run/syslog-ng\.pid -- gen_context(system_u:object_r:syslogd_var_run_t,mls_systemhigh) |
358 |
+/run/syslog-ng(/.*)? gen_context(system_u:object_r:syslogd_var_run_t,s0) |
359 |
+/run/systemd/journal(/.*)? gen_context(system_u:object_r:syslogd_var_run_t,mls_systemhigh) |
360 |
+/run/systemd/journal/socket -s gen_context(system_u:object_r:devlog_t,mls_systemhigh) |
361 |
+/run/systemd/journal/syslog -s gen_context(system_u:object_r:devlog_t,mls_systemhigh) |
362 |
+/run/systemd/journal/dev-log -s gen_context(system_u:object_r:devlog_t,mls_systemhigh) |
363 |
|
364 |
/var/spool/audit(/.*)? gen_context(system_u:object_r:audit_spool_t,mls_systemhigh) |
365 |
/var/spool/bacula/log(/.*)? gen_context(system_u:object_r:var_log_t,s0) |
366 |
|
367 |
diff --git a/policy/modules/system/lvm.fc b/policy/modules/system/lvm.fc |
368 |
index 83782b0..5a39d46 100644 |
369 |
--- a/policy/modules/system/lvm.fc |
370 |
+++ b/policy/modules/system/lvm.fc |
371 |
@@ -109,8 +109,8 @@ ifdef(`distro_gentoo',` |
372 |
/var/cache/multipathd(/.*)? gen_context(system_u:object_r:lvm_metadata_t,s0) |
373 |
/var/lib/multipath(/.*)? gen_context(system_u:object_r:lvm_var_lib_t,s0) |
374 |
/var/lock/lvm(/.*)? gen_context(system_u:object_r:lvm_lock_t,s0) |
375 |
-/var/run/multipathd\.sock -s gen_context(system_u:object_r:lvm_var_run_t,s0) |
376 |
-/var/run/dmevent.* gen_context(system_u:object_r:lvm_var_run_t,s0) |
377 |
+/run/multipathd\.sock -s gen_context(system_u:object_r:lvm_var_run_t,s0) |
378 |
+/run/dmevent.* gen_context(system_u:object_r:lvm_var_run_t,s0) |
379 |
|
380 |
ifdef(`distro_gentoo',` |
381 |
# Bug 529430 comment 7 |
382 |
|
383 |
diff --git a/policy/modules/system/modutils.fc b/policy/modules/system/modutils.fc |
384 |
index 1fda13f..c146cc2 100644 |
385 |
--- a/policy/modules/system/modutils.fc |
386 |
+++ b/policy/modules/system/modutils.fc |
387 |
@@ -23,4 +23,4 @@ ifdef(`distro_gentoo',` |
388 |
/sbin/update-modules -- gen_context(system_u:object_r:kmod_exec_t,s0) |
389 |
|
390 |
/usr/bin/kmod -- gen_context(system_u:object_r:kmod_exec_t,s0) |
391 |
-/var/run/tmpfiles\.d/kmod\.conf -- gen_context(system_u:object_r:kmod_var_run_t,s0) |
392 |
+/run/tmpfiles\.d/kmod\.conf -- gen_context(system_u:object_r:kmod_var_run_t,s0) |
393 |
|
394 |
diff --git a/policy/modules/system/mount.fc b/policy/modules/system/mount.fc |
395 |
index 5f4f548..7844131 100644 |
396 |
--- a/policy/modules/system/mount.fc |
397 |
+++ b/policy/modules/system/mount.fc |
398 |
@@ -8,4 +8,4 @@ |
399 |
|
400 |
/usr/bin/fusermount -- gen_context(system_u:object_r:mount_exec_t,s0) |
401 |
|
402 |
-/var/run/mount(/.*)? gen_context(system_u:object_r:mount_var_run_t,s0) |
403 |
+/run/mount(/.*)? gen_context(system_u:object_r:mount_var_run_t,s0) |
404 |
|
405 |
diff --git a/policy/modules/system/selinuxutil.fc b/policy/modules/system/selinuxutil.fc |
406 |
index 771986f..e9c51b7 100644 |
407 |
--- a/policy/modules/system/selinuxutil.fc |
408 |
+++ b/policy/modules/system/selinuxutil.fc |
409 |
@@ -55,7 +55,7 @@ |
410 |
# |
411 |
# /var/run |
412 |
# |
413 |
-/var/run/restorecond\.pid -- gen_context(system_u:object_r:restorecond_var_run_t,s0) |
414 |
+/run/restorecond\.pid -- gen_context(system_u:object_r:restorecond_var_run_t,s0) |
415 |
|
416 |
ifdef(`distro_gentoo',` |
417 |
# Support for gentoo python switcheridoo |
418 |
|
419 |
diff --git a/policy/modules/system/setrans.fc b/policy/modules/system/setrans.fc |
420 |
index 094ef22..837beab 100644 |
421 |
--- a/policy/modules/system/setrans.fc |
422 |
+++ b/policy/modules/system/setrans.fc |
423 |
@@ -4,4 +4,4 @@ |
424 |
|
425 |
/usr/lib/systemd/system/mcstrans.*\.service -- gen_context(system_u:object_r:setrans_unit_t,s0) |
426 |
|
427 |
-/var/run/setrans(/.*)? gen_context(system_u:object_r:setrans_var_run_t,mls_systemhigh) |
428 |
+/run/setrans(/.*)? gen_context(system_u:object_r:setrans_var_run_t,mls_systemhigh) |
429 |
|
430 |
diff --git a/policy/modules/system/sysnetwork.fc b/policy/modules/system/sysnetwork.fc |
431 |
index d9b674e..02980cb 100644 |
432 |
--- a/policy/modules/system/sysnetwork.fc |
433 |
+++ b/policy/modules/system/sysnetwork.fc |
434 |
@@ -69,15 +69,15 @@ ifdef(`distro_redhat',` |
435 |
/var/lib/dhclient(/.*)? gen_context(system_u:object_r:dhcpc_state_t,s0) |
436 |
/var/lib/wifiroamd(/.*)? gen_context(system_u:object_r:dhcpc_state_t,s0) |
437 |
|
438 |
-/var/run/dhclient.* -- gen_context(system_u:object_r:dhcpc_var_run_t,s0) |
439 |
-/var/run/dhcpcd(/.*)? gen_context(system_u:object_r:dhcpc_var_run_t,s0) |
440 |
+/run/dhclient.* -- gen_context(system_u:object_r:dhcpc_var_run_t,s0) |
441 |
+/run/dhcpcd(/.*)? gen_context(system_u:object_r:dhcpc_var_run_t,s0) |
442 |
|
443 |
ifdef(`distro_gentoo',` |
444 |
/var/lib/dhcpc(/.*)? gen_context(system_u:object_r:dhcpc_state_t,s0) |
445 |
') |
446 |
|
447 |
ifdef(`distro_debian',` |
448 |
-/var/run/network(/.*)? gen_context(system_u:object_r:net_conf_t,s0) |
449 |
+/run/network(/.*)? gen_context(system_u:object_r:net_conf_t,s0) |
450 |
') |
451 |
|
452 |
ifdef(`distro_gentoo',` |
453 |
|
454 |
diff --git a/policy/modules/system/systemd.fc b/policy/modules/system/systemd.fc |
455 |
index a987681..ff0f976 100644 |
456 |
--- a/policy/modules/system/systemd.fc |
457 |
+++ b/policy/modules/system/systemd.fc |
458 |
@@ -31,12 +31,12 @@ |
459 |
|
460 |
/var/lib/systemd/linger(/.*)? gen_context(system_u:object_r:systemd_logind_var_lib_t,s0) |
461 |
|
462 |
-/var/run/\.nologin[^/]* -- gen_context(system_u:object_r:systemd_sessions_var_run_t,s0) |
463 |
-/var/run/nologin -- gen_context(system_u:object_r:systemd_sessions_var_run_t,s0) |
464 |
+/run/\.nologin[^/]* -- gen_context(system_u:object_r:systemd_sessions_var_run_t,s0) |
465 |
+/run/nologin -- gen_context(system_u:object_r:systemd_sessions_var_run_t,s0) |
466 |
|
467 |
-/var/run/systemd/resolve(/.*)? gen_context(system_u:object_r:systemd_resolved_var_run_t,s0) |
468 |
-/var/run/systemd/seats(/.*)? gen_context(system_u:object_r:systemd_logind_var_run_t,s0) |
469 |
-/var/run/systemd/sessions(/.*)? gen_context(system_u:object_r:systemd_logind_var_run_t,s0) |
470 |
-/var/run/systemd/users(/.*)? gen_context(system_u:object_r:systemd_logind_var_run_t,s0) |
471 |
-/var/run/systemd/inhibit(/.*)? gen_context(system_u:object_r:systemd_logind_var_run_t,s0) |
472 |
-/var/run/tmpfiles\.d/kmod.conf gen_context(system_u:object_r:systemd_kmod_conf_t,s0) |
473 |
+/run/systemd/resolve(/.*)? gen_context(system_u:object_r:systemd_resolved_var_run_t,s0) |
474 |
+/run/systemd/seats(/.*)? gen_context(system_u:object_r:systemd_logind_var_run_t,s0) |
475 |
+/run/systemd/sessions(/.*)? gen_context(system_u:object_r:systemd_logind_var_run_t,s0) |
476 |
+/run/systemd/users(/.*)? gen_context(system_u:object_r:systemd_logind_var_run_t,s0) |
477 |
+/run/systemd/inhibit(/.*)? gen_context(system_u:object_r:systemd_logind_var_run_t,s0) |
478 |
+/run/tmpfiles\.d/kmod.conf gen_context(system_u:object_r:systemd_kmod_conf_t,s0) |
479 |
|
480 |
diff --git a/policy/modules/system/udev.fc b/policy/modules/system/udev.fc |
481 |
index 8d414c1..00cfe14 100644 |
482 |
--- a/policy/modules/system/udev.fc |
483 |
+++ b/policy/modules/system/udev.fc |
484 |
@@ -33,11 +33,11 @@ ifdef(`distro_redhat',` |
485 |
|
486 |
/usr/share/virtualbox/VBoxCreateUSBNode\.sh -- gen_context(system_u:object_r:udev_helper_exec_t,s0) |
487 |
|
488 |
-/var/run/udev(/.*)? gen_context(system_u:object_r:udev_var_run_t,s0) |
489 |
+/run/udev(/.*)? gen_context(system_u:object_r:udev_var_run_t,s0) |
490 |
|
491 |
ifdef(`distro_debian',` |
492 |
/lib/systemd/systemd-udevd -- gen_context(system_u:object_r:udev_exec_t,s0) |
493 |
-/var/run/xen-hotplug -d gen_context(system_u:object_r:udev_var_run_t,s0) |
494 |
+/run/xen-hotplug -d gen_context(system_u:object_r:udev_var_run_t,s0) |
495 |
') |
496 |
|
497 |
ifdef(`distro_gentoo',` |
498 |
|
499 |
diff --git a/policy/modules/system/userdomain.fc b/policy/modules/system/userdomain.fc |
500 |
index 0214d21..c8b881e 100644 |
501 |
--- a/policy/modules/system/userdomain.fc |
502 |
+++ b/policy/modules/system/userdomain.fc |
503 |
@@ -4,9 +4,9 @@ HOME_DIR/\.pki(/.*)? gen_context(system_u:object_r:user_cert_t,s0) |
504 |
|
505 |
/tmp/gconfd-USER -d gen_context(system_u:object_r:user_tmp_t,s0) |
506 |
|
507 |
-/var/run/user -d gen_context(system_u:object_r:user_runtime_root_t,s0) |
508 |
-/var/run/user/[^/]+ -d gen_context(system_u:object_r:user_runtime_t,s0) |
509 |
-/var/run/user/[^/]+/.+ -d <<none>> |
510 |
+/run/user -d gen_context(system_u:object_r:user_runtime_root_t,s0) |
511 |
+/run/user/[^/]+ -d gen_context(system_u:object_r:user_runtime_t,s0) |
512 |
+/run/user/[^/]+/.+ -d <<none>> |
513 |
# new genhomedircon required for these patterns |
514 |
-/var/run/user/%{USERID} -d gen_context(system_u:object_r:user_runtime_t,s0) |
515 |
-/var/run/user/%{USERID}/.+ <<none>> |
516 |
+/run/user/%{USERID} -d gen_context(system_u:object_r:user_runtime_t,s0) |
517 |
+/run/user/%{USERID}/.+ <<none>> |