diff options
-rw-r--r-- | config/file_contexts.subs_dist | 1 | ||||
-rw-r--r-- | policy/modules/contrib/hadoop.fc | 7 | ||||
-rw-r--r-- | policy/modules/contrib/tmpreaper.fc | 4 | ||||
-rw-r--r-- | policy/modules/contrib/vde.fc | 2 | ||||
-rw-r--r-- | policy/modules/kernel/corecommands.fc | 2 | ||||
-rw-r--r-- | policy/modules/kernel/files.fc | 2 | ||||
-rw-r--r-- | policy/modules/services/xserver.fc | 2 | ||||
-rw-r--r-- | policy/modules/system/init.fc | 2 |
8 files changed, 6 insertions, 16 deletions
diff --git a/config/file_contexts.subs_dist b/config/file_contexts.subs_dist index 9121dce9..9ec5747d 100644 --- a/config/file_contexts.subs_dist +++ b/config/file_contexts.subs_dist @@ -1,3 +1,4 @@ +/etc/init.d /etc/rc.d/init.d /lib32 /lib /lib64 /lib /run /var/run diff --git a/policy/modules/contrib/hadoop.fc b/policy/modules/contrib/hadoop.fc index 633c4701..8bc8a780 100644 --- a/policy/modules/contrib/hadoop.fc +++ b/policy/modules/contrib/hadoop.fc @@ -1,12 +1,5 @@ /etc/hadoop.* gen_context(system_u:object_r:hadoop_etc_t,s0) -/etc/init\.d/hadoop-(.*-)?datanode -- gen_context(system_u:object_r:hadoop_datanode_initrc_exec_t,s0) -/etc/init\.d/hadoop-(.*-)?jobtracker -- gen_context(system_u:object_r:hadoop_jobtracker_initrc_exec_t,s0) -/etc/init\.d/hadoop-(.*-)?namenode -- gen_context(system_u:object_r:hadoop_namenode_initrc_exec_t,s0) -/etc/init\.d/hadoop-(.*-)?secondarynamenode -- gen_context(system_u:object_r:hadoop_secondarynamenode_initrc_exec_t,s0) -/etc/init\.d/hadoop-(.*-)?tasktracker -- gen_context(system_u:object_r:hadoop_tasktracker_initrc_exec_t,s0) -/etc/init\.d/zookeeper -- gen_context(system_u:object_r:zookeeper_server_initrc_exec_t,s0) - /etc/rc\.d/init\.d/hadoop-(.*-)?datanode -- gen_context(system_u:object_r:hadoop_datanode_initrc_exec_t,s0) /etc/rc\.d/init\.d/hadoop-(.*-)?jobtracker -- gen_context(system_u:object_r:hadoop_jobtracker_initrc_exec_t,s0) /etc/rc\.d/init\.d/hadoop-(.*-)?namenode -- gen_context(system_u:object_r:hadoop_namenode_initrc_exec_t,s0) diff --git a/policy/modules/contrib/tmpreaper.fc b/policy/modules/contrib/tmpreaper.fc index fcc10e89..42ee1224 100644 --- a/policy/modules/contrib/tmpreaper.fc +++ b/policy/modules/contrib/tmpreaper.fc @@ -1,6 +1,6 @@ ifdef(`distro_debian',` -/etc/init\.d/mountall-bootclean.sh -- gen_context(system_u:object_r:tmpreaper_exec_t,s0) -/etc/init\.d/mountnfs-bootclean.sh -- gen_context(system_u:object_r:tmpreaper_exec_t,s0) +/etc/rc\.d/init\.d/mountall-bootclean.sh -- gen_context(system_u:object_r:tmpreaper_exec_t,s0) +/etc/rc\.d/init\.d/mountnfs-bootclean.sh -- gen_context(system_u:object_r:tmpreaper_exec_t,s0) ') /usr/sbin/tmpreaper -- gen_context(system_u:object_r:tmpreaper_exec_t,s0) diff --git a/policy/modules/contrib/vde.fc b/policy/modules/contrib/vde.fc index ab984b06..d449e06d 100644 --- a/policy/modules/contrib/vde.fc +++ b/policy/modules/contrib/vde.fc @@ -1,4 +1,4 @@ -/etc/init.d/vde -- gen_context(system_u:object_r:vde_initrc_exec_t,s0) +/etc/rc\.d/init\.d/vde -- gen_context(system_u:object_r:vde_initrc_exec_t,s0) /usr/bin/vde_switch -- gen_context(system_u:object_r:vde_exec_t,s0) /usr/sbin/vde_tunctl -- gen_context(system_u:object_r:vde_exec_t,s0) /var/run/vde\.ctl(/.*)? gen_context(system_u:object_r:vde_var_run_t,s0) diff --git a/policy/modules/kernel/corecommands.fc b/policy/modules/kernel/corecommands.fc index 0ec2975a..4592f8a3 100644 --- a/policy/modules/kernel/corecommands.fc +++ b/policy/modules/kernel/corecommands.fc @@ -66,8 +66,6 @@ ifdef(`distro_redhat',` /etc/hotplug/hotplug\.functions -- gen_context(system_u:object_r:bin_t,s0) /etc/hotplug\.d/default/default.* gen_context(system_u:object_r:bin_t,s0) -/etc/init\.d/functions -- gen_context(system_u:object_r:bin_t,s0) - /etc/kde/env(/.*)? gen_context(system_u:object_r:bin_t,s0) /etc/kde/shutdown(/.*)? gen_context(system_u:object_r:bin_t,s0) diff --git a/policy/modules/kernel/files.fc b/policy/modules/kernel/files.fc index 8796ca3a..1975fc46 100644 --- a/policy/modules/kernel/files.fc +++ b/policy/modules/kernel/files.fc @@ -84,7 +84,7 @@ ifdef(`distro_redhat',` ifdef(`distro_suse',` /etc/defkeymap\.map -- gen_context(system_u:object_r:etc_runtime_t,s0) -/etc/init\.d/\.depend.* -- gen_context(system_u:object_r:etc_runtime_t,s0) +/etc/rc\.d/init\.d/\.depend.* -- gen_context(system_u:object_r:etc_runtime_t,s0) ') # diff --git a/policy/modules/services/xserver.fc b/policy/modules/services/xserver.fc index c64ca8aa..30fc0e84 100644 --- a/policy/modules/services/xserver.fc +++ b/policy/modules/services/xserver.fc @@ -23,7 +23,7 @@ HOME_DIR/\.Xauthority.* -- gen_context(system_u:object_r:xauth_home_t,s0) /etc/gdm/PreSession/.* -- gen_context(system_u:object_r:xsession_exec_t,s0) /etc/gdm/Xsession -- gen_context(system_u:object_r:xsession_exec_t,s0) -/etc/init\.d/xfree86-common -- gen_context(system_u:object_r:xserver_exec_t,s0) +/etc/rc\.d/init\.d/xfree86-common -- gen_context(system_u:object_r:xserver_exec_t,s0) /etc/kde[34]?/kdm/Xstartup -- gen_context(system_u:object_r:xsession_exec_t,s0) /etc/kde[34]?/kdm/Xreset -- gen_context(system_u:object_r:xsession_exec_t,s0) diff --git a/policy/modules/system/init.fc b/policy/modules/system/init.fc index 456bcc4f..eac17808 100644 --- a/policy/modules/system/init.fc +++ b/policy/modules/system/init.fc @@ -1,8 +1,6 @@ # # /etc # -/etc/init\.d/.* -- gen_context(system_u:object_r:initrc_exec_t,s0) - /etc/rc\.d/rc -- gen_context(system_u:object_r:initrc_exec_t,s0) /etc/rc\.d/rc\.[^/]+ -- gen_context(system_u:object_r:initrc_exec_t,s0) |