Allow apmd to run pm-suspend and create the devicekit log files with the correct...

diff --git a/policy/modules/services/apm.te b/policy/modules/services/apm.te
index f8de34e8c41390828a6ccef8ebe59510f1cfbd35..97a81724e992d683176b20f239a8ad74a252a6bb 100644 (file)
--- a/policy/modules/services/apm.te
+++ b/policy/modules/services/apm.te
@@ -192,6 +192,11 @@ optional_policy(`
        cron_anacron_domtrans_system_job(apmd_t)
 ')
 
+optional_policy(`
+       devicekit_manage_pid_files(apmd_t)
+       devicekit_manage_log_files(apmd_t)
+')
+
 optional_policy(`
        dbus_system_bus_client(apmd_t)
 

diff --git a/policy/modules/services/devicekit.if b/policy/modules/services/devicekit.if
index b62f5a91f1bf5c4d2c6be197ebfafe77f7f6dc0c..6a01a195a1bdda9745d6e6e5783c5948d9555a89 100644 (file)
--- a/policy/modules/services/devicekit.if
+++ b/policy/modules/services/devicekit.if
@@ -290,6 +290,27 @@ interface(`devicekit_manage_pid_files',`
        manage_files_pattern($1, devicekit_var_run_t, devicekit_var_run_t)
 ')
 
+########################################
+## <summary>
+##     Manage devicekit LOG files.
+## </summary>
+## <param name="domain">
+##     <summary>
+##     Domain allowed access.
+##     </summary>
+## </param>
+#
+interface(`devicekit_manage_log_files',`
+       gen_require(`
+               type devicekit_log_t;
+       ')
+
+       files_search_logs($1)
+       manage_files_pattern($1, devicekit_log_t, devicekit_log_t)
+       logging_log_filetrans($1, devicekit_log_t, file, "pm-powersave.log")
+       logging_log_filetrans($1, devicekit_log_t, file, "pm-suspend.log")
+')
+
 ########################################
 ## <summary>
 ##     All of the rules required to administrate
@@ -348,4 +369,6 @@ interface(`devicekit_filetrans_named_content',`
        ')
 
        files_pid_filetrans($1, devicekit_var_run_t, dir, "pm-utils")
+       logging_log_filetrans($1, devicekit_log_t, file, "pm-powersave.log")
+       logging_log_filetrans($1, devicekit_log_t, file, "pm-suspend.log")
 ')