Cleanup watchdog code for submission to upstream

diff --git a/policy/modules/services/wdmd.te b/policy/modules/services/wdmd.te
index 307c99e954bee4d373365e81b67643f8de885e80..11b8863cfb2f9509a6f365ab4c5fbb3582fca152 100644 (file)
--- a/policy/modules/services/wdmd.te
+++ b/policy/modules/services/wdmd.te
@@ -30,22 +30,15 @@ manage_files_pattern(wdmd_t, wdmd_var_run_t, wdmd_var_run_t)
 manage_sock_files_pattern(wdmd_t, wdmd_var_run_t, wdmd_var_run_t)
 files_pid_filetrans(wdmd_t, wdmd_var_run_t, { file dir sock_file })
 
+dev_read_watchdog(wdmd_t)
 dev_write_watchdog(wdmd_t)
 
 domain_use_interactive_fds(wdmd_t)
 
 files_read_etc_files(wdmd_t)
 
-logging_send_syslog_msg(wdmd_t)
-
-miscfiles_read_localization(wdmd_t)
-
 fs_read_anon_inodefs_files(wdmd_t)
 
-gen_require(`
-       type watchdog_device_t;
-')
+logging_send_syslog_msg(wdmd_t)
 
-#dev_read_watchdog(wdmd_t)
-#============= wdmd_t ==============
-allow wdmd_t watchdog_device_t:chr_file read;
+miscfiles_read_localization(wdmd_t)