| 1 |
commit: 94f9528c2081df4175e21780c0d1c3742a728ec2 |
| 2 |
Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> |
| 3 |
AuthorDate: Wed Dec 26 12:44:18 2012 +0000 |
| 4 |
Commit: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> |
| 5 |
CommitDate: Wed Dec 26 12:44:18 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=94f9528c |
| 7 |
|
| 8 |
Fix specification collision |
| 9 |
|
| 10 |
In the devicekit contexts, pm-utils(/.*)? is colliding with the pm(/.*)? |
| 11 |
definition in HAL. So switching the definition in HAL to use the pm/ directory |
| 12 |
itself and leave pm-utils for devicekit. |
| 13 |
|
| 14 |
--- |
| 15 |
policy/modules/contrib/hal.fc | 3 ++- |
| 16 |
1 files changed, 2 insertions(+), 1 deletions(-) |
| 17 |
|
| 18 |
diff --git a/policy/modules/contrib/hal.fc b/policy/modules/contrib/hal.fc |
| 19 |
index 2899bad..a64b30e 100644 |
| 20 |
--- a/policy/modules/contrib/hal.fc |
| 21 |
+++ b/policy/modules/contrib/hal.fc |
| 22 |
@@ -22,6 +22,7 @@ |
| 23 |
|
| 24 |
/var/run/hald(/.*)? gen_context(system_u:object_r:hald_var_run_t,s0) |
| 25 |
/var/run/haldaemon\.pid -- gen_context(system_u:object_r:hald_var_run_t,s0) |
| 26 |
-/var/run/pm(/.*)? gen_context(system_u:object_r:hald_var_run_t,s0) |
| 27 |
+/var/run/pm -d gen_context(system_u:object_r:hald_var_run_t,s0) |
| 28 |
+/var/run/pm/(.*)? gen_context(system_u:object_r:hald_var_run_t,s0) |
| 29 |
/var/run/synce.* gen_context(system_u:object_r:hald_var_run_t,s0) |
| 30 |
/var/run/vbe.* -- gen_context(system_u:object_r:hald_var_run_t,s0) |
Archives