Mcelog update from Guido Trentalancia.

2012-08-08 08:44:07 -04:00 · 2012-08-08 08:44:07 -04:00 · b70d528401
parent 095f6dcca9
commit b70d528401
4 changed files with 11 additions and 3 deletions
--- a/2
+++ b/2
@ -1,3 +1,5 @@
+- Mcelog update from Guido Trentalancia.
+
 * Wed Jul 25 2012 Chris PeBenito <selinux@tresys.com> - 2.20120725
 - Rename epollwakeup capability2 permission to block_suspend to match the
  corresponding kernel capability rename.
--- a/policy/modules/contrib
+++ b/policy/modules/contrib
@ -1 +1 @@
-Subproject commit 1a411e91f9d2312eb65a0521dc918ff7b01061a3
+Subproject commit 6f2c1a45e740dacdd566cfb6ff482400a22ff908
--- a/policy/modules/kernel/corecommands.fc
+++ b/policy/modules/kernel/corecommands.fc
@ -72,8 +72,14 @@ ifdef(`distro_redhat',`
 /etc/kde/shutdown(/.*)?			gen_context(system_u:object_r:bin_t,s0)

 /etc/mail/make			--	gen_context(system_u:object_r:bin_t,s0)
-/etc/mcelog/cache-error-trigger	--	gen_context(system_u:object_r:bin_t,s0)
+
+/etc/mcelog/.*-error-trigger	--	gen_context(system_u:object_r:bin_t,s0)
+/etc/mcelog/.*\.local		--	gen_context(system_u:object_r:bin_t,s0)
+
+ifdef(`distro_redhat',`
 /etc/mcelog/triggers(/.*)?		gen_context(system_u:object_r:bin_t,s0)
+')
+
 /etc/mgetty\+sendfax/new_fax	--	gen_context(system_u:object_r:bin_t,s0)

 /etc/netplug\.d(/.*)? 	 		gen_context(system_u:object_r:bin_t,s0)
--- a/policy/modules/kernel/corecommands.te
+++ b/policy/modules/kernel/corecommands.te
@ -1,4 +1,4 @@
-policy_module(corecommands, 1.17.0)
+policy_module(corecommands, 1.17.1)

 ########################################
 #