summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin Ouyang <Xin.Ouyang@windriver.com>2012-09-10 17:42:30 +0800
committerXin Ouyang <Xin.Ouyang@windriver.com>2012-10-18 11:07:43 +0800
commit493195cbba8f91ecd97aef3a8fbdba1092e766a6 (patch)
tree112fbe973a0d62ac2cfdbb3624bbe395150c4ef5
parenta5f383928582b03911476c2e11ce8b6128db4b8f (diff)
downloadmeta-selinux-493195cbba8f91ecd97aef3a8fbdba1092e766a6.tar.gz
refpolicy: uprev to version 2.20120725.
Patches are migrated or droped for new version. * poky-fc-etc_init.d.patch: droped because file_contexts.subs_dist is defined to instead. * fix-mount-to-write-mountpoints-dirs.patch: droped because the rules is not needed now. * poky-fc-update-alternatives_sysvinit.patch: migrated. Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
-rw-r--r--recipes-security/refpolicy/refpolicy-2.20120215/fix-mount-to-write-mountpoints-dirs.patch81
-rw-r--r--recipes-security/refpolicy/refpolicy-2.20120215/poky-fc-etc_init.d.patch1455
-rw-r--r--recipes-security/refpolicy/refpolicy-2.20120725/poky-fc-update-alternatives_sysvinit.patch (renamed from recipes-security/refpolicy/refpolicy-2.20120215/poky-fc-update-alternatives_sysvinit.patch)12
-rw-r--r--recipes-security/refpolicy/refpolicy-mls_2.20120725.bb (renamed from recipes-security/refpolicy/refpolicy-mls_2.20120215.bb)0
-rw-r--r--recipes-security/refpolicy/refpolicy-standard_2.20120725.bb (renamed from recipes-security/refpolicy/refpolicy-standard_2.20120215.bb)0
-rw-r--r--recipes-security/refpolicy/refpolicy_2.20120215.inc11
-rw-r--r--recipes-security/refpolicy/refpolicy_2.20120725.inc9
7 files changed, 14 insertions, 1554 deletions
diff --git a/recipes-security/refpolicy/refpolicy-2.20120215/fix-mount-to-write-mountpoints-dirs.patch b/recipes-security/refpolicy/refpolicy-2.20120215/fix-mount-to-write-mountpoints-dirs.patch
deleted file mode 100644
index 5003eee..0000000
--- a/recipes-security/refpolicy/refpolicy-2.20120215/fix-mount-to-write-mountpoints-dirs.patch
+++ /dev/null
@@ -1,81 +0,0 @@
1From 613c4585de3a55db82b209088cb0792b23d1afd8 Mon Sep 17 00:00:00 2001
2From: Xin Ouyang <Xin.Ouyang@windriver.com>
3Date: Tue, 3 Jul 2012 10:57:44 +0800
4Subject: [PATCH] refpolicy: fix mount to write mountpoints/dirs.
5
6Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
7---
8 policy/modules/kernel/files.if | 36 ++++++++++++++++++++++++++++++++++++
9 policy/modules/system/mount.te | 2 ++
10 2 files changed, 38 insertions(+), 0 deletions(-)
11
12diff --git a/policy/modules/kernel/files.if b/policy/modules/kernel/files.if
13index deb24b4..79966aa 100644
14--- a/policy/modules/kernel/files.if
15+++ b/policy/modules/kernel/files.if
16@@ -1482,6 +1482,42 @@ interface(`files_dontaudit_list_all_mountpoints',`
17
18 ########################################
19 ## <summary>
20+## Write all mount points.
21+## </summary>
22+## <param name="domain">
23+## <summary>
24+## Domain allowed access.
25+## </summary>
26+## </param>
27+#
28+interface(`files_write_all_mountpoints',`
29+ gen_require(`
30+ attribute mountpoint;
31+ ')
32+
33+ allow $1 mountpoint:dir write;
34+')
35+
36+########################################
37+## <summary>
38+## Write all file type directories.
39+## </summary>
40+## <param name="domain">
41+## <summary>
42+## Domain allowed access.
43+## </summary>
44+## </param>
45+#
46+interface(`files_write_all_dirs',`
47+ gen_require(`
48+ attribute file_type;
49+ ')
50+
51+ allow $1 file_type:dir write;
52+')
53+
54+########################################
55+## <summary>
56 ## List the contents of the root directory.
57 ## </summary>
58 ## <param name="domain">
59diff --git a/policy/modules/system/mount.te b/policy/modules/system/mount.te
60index fba350b..991bf62 100644
61--- a/policy/modules/system/mount.te
62+++ b/policy/modules/system/mount.te
63@@ -79,6 +79,7 @@ files_manage_etc_runtime_files(mount_t)
64 files_etc_filetrans_etc_runtime(mount_t, file)
65 files_mounton_all_mountpoints(mount_t)
66 files_unmount_rootfs(mount_t)
67+files_write_all_mountpoints(mount_t)
68 # These rules need to be generalized. Only admin, initrc should have it:
69 files_relabelto_all_file_type_fs(mount_t)
70 files_mount_all_file_type_fs(mount_t)
71@@ -89,6 +90,7 @@ files_read_isid_type_files(mount_t)
72 # For reading cert files
73 files_read_usr_files(mount_t)
74 files_list_mnt(mount_t)
75+files_write_all_dirs(mount_t)
76 files_dontaudit_write_root_dirs(mount_t)
77
78 fs_getattr_xattr_fs(mount_t)
79--
801.7.5.4
81
diff --git a/recipes-security/refpolicy/refpolicy-2.20120215/poky-fc-etc_init.d.patch b/recipes-security/refpolicy/refpolicy-2.20120215/poky-fc-etc_init.d.patch
deleted file mode 100644
index 9fbe33d..0000000
--- a/recipes-security/refpolicy/refpolicy-2.20120215/poky-fc-etc_init.d.patch
+++ /dev/null
@@ -1,1455 +0,0 @@
1From 6daeab30481b98b3d2c7243fa27639fd3f3a1a7b Mon Sep 17 00:00:00 2001
2From: Xin Ouyang <Xin.Ouyang@windriver.com>
3Date: Mon, 2 Jul 2012 17:37:36 +0800
4Subject: [PATCH] refpolicy: replace all fc /etc/rc.d/init.d to /etc/init.d
5
61. batch replace
7grep -Rl "/etc/rc\\\.d/init" * | xargs sed -i 's:/etc/rc\\.d/init:/etc/init:'
8grep -Rl "/etc/rc\.d/init" * | xargs sed -i 's:/etc/rc.d/init:/etc/init:'
9
102. Then modify policy/modules/system/init.fc
11@@ -3,10 +3,10 @@
12 #
13 /etc/init\.d/.* -- gen_context(system_u:object_r:initrc_exec_t,s0)
14
15-/etc/rc\.d/rc -- gen_context(system_u:object_r:initrc_exec_t,s0)
16-/etc/rc\.d/rc\.[^/]+ -- gen_context(system_u:object_r:initrc_exec_t,s0)
17+/etc/init\.d/rc -- gen_context(system_u:object_r:initrc_exec_t,s0)
18+/etc/rc\.[^/]+ -- gen_context(system_u:object_r:initrc_exec_t,s0)
19
203. delete duplicate fc
21 > policy/modules/contrib/hadoop.fc : /etc/init\.d/hadoop-xxxx
22 > policy/modules/kernel/corecommands.fc : /etc/init\.d/functions
23 > policy/modules/system/init.fc : /etc/init\.d/.*.
24---
25 policy/modules/contrib/abrt.fc | 2 +-
26 policy/modules/contrib/afs.fc | 4 ++--
27 policy/modules/contrib/aiccu.fc | 2 +-
28 policy/modules/contrib/aisexec.fc | 2 +-
29 policy/modules/contrib/amavis.fc | 2 +-
30 policy/modules/contrib/apache.fc | 4 ++--
31 policy/modules/contrib/apcupsd.fc | 2 +-
32 policy/modules/contrib/arpwatch.fc | 2 +-
33 policy/modules/contrib/asterisk.fc | 2 +-
34 policy/modules/contrib/automount.fc | 2 +-
35 policy/modules/contrib/avahi.fc | 2 +-
36 policy/modules/contrib/bind.fc | 4 ++--
37 policy/modules/contrib/bitlbee.fc | 2 +-
38 policy/modules/contrib/bluetooth.fc | 6 +++---
39 policy/modules/contrib/canna.fc | 2 +-
40 policy/modules/contrib/certmaster.fc | 2 +-
41 policy/modules/contrib/certmonger.fc | 2 +-
42 policy/modules/contrib/cgroup.fc | 4 ++--
43 policy/modules/contrib/chronyd.fc | 2 +-
44 policy/modules/contrib/clamav.fc | 2 +-
45 policy/modules/contrib/cmirrord.fc | 2 +-
46 policy/modules/contrib/cobbler.fc | 2 +-
47 policy/modules/contrib/corosync.fc | 2 +-
48 policy/modules/contrib/cron.fc | 2 +-
49 policy/modules/contrib/cups.fc | 2 +-
50 policy/modules/contrib/cyrus.fc | 2 +-
51 policy/modules/contrib/ddclient.fc | 2 +-
52 policy/modules/contrib/denyhosts.fc | 2 +-
53 policy/modules/contrib/dhcp.fc | 2 +-
54 policy/modules/contrib/dictd.fc | 2 +-
55 policy/modules/contrib/dnsmasq.fc | 2 +-
56 policy/modules/contrib/dovecot.fc | 2 +-
57 policy/modules/contrib/fail2ban.fc | 2 +-
58 policy/modules/contrib/ftp.fc | 4 ++--
59 policy/modules/contrib/glance.fc | 4 ++--
60 policy/modules/contrib/gpsd.fc | 2 +-
61 policy/modules/contrib/hadoop.fc | 7 -------
62 policy/modules/contrib/hddtemp.fc | 2 +-
63 policy/modules/contrib/icecast.fc | 2 +-
64 policy/modules/contrib/ifplugd.fc | 2 +-
65 policy/modules/contrib/inn.fc | 2 +-
66 policy/modules/contrib/jabber.fc | 2 +-
67 policy/modules/contrib/kdump.fc | 2 +-
68 policy/modules/contrib/kerberos.fc | 8 ++++----
69 policy/modules/contrib/kerneloops.fc | 2 +-
70 policy/modules/contrib/ksmtuned.fc | 2 +-
71 policy/modules/contrib/ldap.fc | 2 +-
72 policy/modules/contrib/likewise.fc | 16 ++++++++--------
73 policy/modules/contrib/lircd.fc | 2 +-
74 policy/modules/contrib/memcached.fc | 2 +-
75 policy/modules/contrib/mpd.fc | 2 +-
76 policy/modules/contrib/munin.fc | 2 +-
77 policy/modules/contrib/mysql.fc | 4 ++--
78 policy/modules/contrib/nagios.fc | 4 ++--
79 policy/modules/contrib/networkmanager.fc | 2 +-
80 policy/modules/contrib/nis.fc | 8 ++++----
81 policy/modules/contrib/nscd.fc | 2 +-
82 policy/modules/contrib/nslcd.fc | 2 +-
83 policy/modules/contrib/ntp.fc | 2 +-
84 policy/modules/contrib/oident.fc | 2 +-
85 policy/modules/contrib/openvpn.fc | 2 +-
86 policy/modules/contrib/pads.fc | 2 +-
87 policy/modules/contrib/pingd.fc | 2 +-
88 policy/modules/contrib/portreserve.fc | 2 +-
89 policy/modules/contrib/postfixpolicyd.fc | 2 +-
90 policy/modules/contrib/postgrey.fc | 2 +-
91 policy/modules/contrib/ppp.fc | 2 +-
92 policy/modules/contrib/prelude.fc | 6 +++---
93 policy/modules/contrib/privoxy.fc | 2 +-
94 policy/modules/contrib/psad.fc | 2 +-
95 policy/modules/contrib/puppet.fc | 4 ++--
96 policy/modules/contrib/qpid.fc | 2 +-
97 policy/modules/contrib/radius.fc | 2 +-
98 policy/modules/contrib/radvd.fc | 2 +-
99 policy/modules/contrib/rhsmcertd.fc | 2 +-
100 policy/modules/contrib/roundup.fc | 2 +-
101 policy/modules/contrib/rpc.fc | 6 +++---
102 policy/modules/contrib/rpcbind.fc | 2 +-
103 policy/modules/contrib/rwho.fc | 2 +-
104 policy/modules/contrib/samba.fc | 6 +++---
105 policy/modules/contrib/samhain.fc | 2 +-
106 policy/modules/contrib/sanlock.fc | 2 +-
107 policy/modules/contrib/sasl.fc | 2 +-
108 policy/modules/contrib/shorewall.fc | 4 ++--
109 policy/modules/contrib/smartmon.fc | 2 +-
110 policy/modules/contrib/smokeping.fc | 2 +-
111 policy/modules/contrib/snmp.fc | 4 ++--
112 policy/modules/contrib/snort.fc | 2 +-
113 policy/modules/contrib/soundserver.fc | 2 +-
114 policy/modules/contrib/squid.fc | 2 +-
115 policy/modules/contrib/sssd.fc | 2 +-
116 policy/modules/contrib/tcsd.fc | 2 +-
117 policy/modules/contrib/tgtd.fc | 2 +-
118 policy/modules/contrib/tor.fc | 2 +-
119 policy/modules/contrib/tuned.fc | 2 +-
120 policy/modules/contrib/ulogd.fc | 2 +-
121 policy/modules/contrib/uuidd.fc | 2 +-
122 policy/modules/contrib/varnishd.fc | 6 +++---
123 policy/modules/contrib/vhostmd.fc | 2 +-
124 policy/modules/contrib/virt.fc | 2 +-
125 policy/modules/contrib/zabbix.fc | 4 ++--
126 policy/modules/contrib/zebra.fc | 12 ++++++------
127 policy/modules/kernel/corecommands.fc | 2 --
128 policy/modules/services/postgresql.fc | 2 +-
129 policy/modules/system/init.fc | 5 ++---
130 policy/modules/system/init.te | 4 ++--
131 policy/modules/system/ipsec.fc | 4 ++--
132 policy/modules/system/iptables.fc | 4 ++--
133 policy/modules/system/logging.fc | 4 ++--
134 policy/modules/system/setrans.fc | 2 +-
135 110 files changed, 153 insertions(+), 163 deletions(-)
136
137diff --git a/policy/modules/contrib/abrt.fc b/policy/modules/contrib/abrt.fc
138index 1bd5812..7661412 100644
139--- a/policy/modules/contrib/abrt.fc
140+++ b/policy/modules/contrib/abrt.fc
141@@ -1,5 +1,5 @@
142 /etc/abrt(/.*)? gen_context(system_u:object_r:abrt_etc_t,s0)
143-/etc/rc\.d/init\.d/abrt -- gen_context(system_u:object_r:abrt_initrc_exec_t,s0)
144+/etc/init\.d/abrt -- gen_context(system_u:object_r:abrt_initrc_exec_t,s0)
145
146 /usr/bin/abrt-pyhook-helper -- gen_context(system_u:object_r:abrt_helper_exec_t,s0)
147
148diff --git a/policy/modules/contrib/afs.fc b/policy/modules/contrib/afs.fc
149index eaea138..d3c74fe 100644
150--- a/policy/modules/contrib/afs.fc
151+++ b/policy/modules/contrib/afs.fc
152@@ -1,5 +1,5 @@
153-/etc/rc\.d/init\.d/openafs-client -- gen_context(system_u:object_r:afs_initrc_exec_t,s0)
154-/etc/rc\.d/init\.d/afs -- gen_context(system_u:object_r:afs_initrc_exec_t,s0)
155+/etc/init\.d/openafs-client -- gen_context(system_u:object_r:afs_initrc_exec_t,s0)
156+/etc/init\.d/afs -- gen_context(system_u:object_r:afs_initrc_exec_t,s0)
157
158 /usr/afs/bin/bosserver -- gen_context(system_u:object_r:afs_bosserver_exec_t,s0)
159 /usr/afs/bin/fileserver -- gen_context(system_u:object_r:afs_fsserver_exec_t,s0)
160diff --git a/policy/modules/contrib/aiccu.fc b/policy/modules/contrib/aiccu.fc
161index 069518f..dd130c0 100644
162--- a/policy/modules/contrib/aiccu.fc
163+++ b/policy/modules/contrib/aiccu.fc
164@@ -1,5 +1,5 @@
165 /etc/aiccu.conf -- gen_context(system_u:object_r:aiccu_etc_t,s0)
166-/etc/rc\.d/init\.d/aiccu -- gen_context(system_u:object_r:aiccu_initrc_exec_t,s0)
167+/etc/init\.d/aiccu -- gen_context(system_u:object_r:aiccu_initrc_exec_t,s0)
168
169 /usr/sbin/aiccu -- gen_context(system_u:object_r:aiccu_exec_t,s0)
170
171diff --git a/policy/modules/contrib/aisexec.fc b/policy/modules/contrib/aisexec.fc
172index 7b4f4b9..5fcf0f0 100644
173--- a/policy/modules/contrib/aisexec.fc
174+++ b/policy/modules/contrib/aisexec.fc
175@@ -1,4 +1,4 @@
176-/etc/rc\.d/init\.d/openais -- gen_context(system_u:object_r:aisexec_initrc_exec_t,s0)
177+/etc/init\.d/openais -- gen_context(system_u:object_r:aisexec_initrc_exec_t,s0)
178
179 /usr/sbin/aisexec -- gen_context(system_u:object_r:aisexec_exec_t,s0)
180
181diff --git a/policy/modules/contrib/amavis.fc b/policy/modules/contrib/amavis.fc
182index 3b66910..506f69f 100644
183--- a/policy/modules/contrib/amavis.fc
184+++ b/policy/modules/contrib/amavis.fc
185@@ -1,7 +1,7 @@
186
187 /etc/amavis(d)?\.conf -- gen_context(system_u:object_r:amavis_etc_t,s0)
188 /etc/amavisd(/.*)? gen_context(system_u:object_r:amavis_etc_t,s0)
189-/etc/rc\.d/init\.d/amavis -- gen_context(system_u:object_r:amavis_initrc_exec_t,s0)
190+/etc/init\.d/amavis -- gen_context(system_u:object_r:amavis_initrc_exec_t,s0)
191
192 /usr/sbin/amavisd.* -- gen_context(system_u:object_r:amavis_exec_t,s0)
193 /usr/lib(64)?/AntiVir/antivir -- gen_context(system_u:object_r:amavis_exec_t,s0)
194diff --git a/policy/modules/contrib/apache.fc b/policy/modules/contrib/apache.fc
195index 9e39aa5..8a528e1 100644
196--- a/policy/modules/contrib/apache.fc
197+++ b/policy/modules/contrib/apache.fc
198@@ -10,8 +10,8 @@ HOME_DIR/((www)|(web)|(public_html))(/.+)? gen_context(system_u:object_r:httpd_u
199 /etc/httpd/modules gen_context(system_u:object_r:httpd_modules_t,s0)
200 /etc/lighttpd(/.*)? gen_context(system_u:object_r:httpd_config_t,s0)
201 /etc/mock/koji(/.*)? gen_context(system_u:object_r:httpd_sys_rw_content_t,s0)
202-/etc/rc\.d/init\.d/httpd -- gen_context(system_u:object_r:httpd_initrc_exec_t,s0)
203-/etc/rc\.d/init\.d/lighttpd -- gen_context(system_u:object_r:httpd_initrc_exec_t,s0)
204+/etc/init\.d/httpd -- gen_context(system_u:object_r:httpd_initrc_exec_t,s0)
205+/etc/init\.d/lighttpd -- gen_context(system_u:object_r:httpd_initrc_exec_t,s0)
206
207 /etc/vhosts -- gen_context(system_u:object_r:httpd_config_t,s0)
208 /etc/zabbix/web(/.*)? gen_context(system_u:object_r:httpd_sys_rw_content_t,s0)
209diff --git a/policy/modules/contrib/apcupsd.fc b/policy/modules/contrib/apcupsd.fc
210index cd07b96..8cab4f9 100644
211--- a/policy/modules/contrib/apcupsd.fc
212+++ b/policy/modules/contrib/apcupsd.fc
213@@ -1,4 +1,4 @@
214-/etc/rc\.d/init\.d/apcupsd -- gen_context(system_u:object_r:apcupsd_initrc_exec_t,s0)
215+/etc/init\.d/apcupsd -- gen_context(system_u:object_r:apcupsd_initrc_exec_t,s0)
216
217 /sbin/apcupsd -- gen_context(system_u:object_r:apcupsd_exec_t,s0)
218
219diff --git a/policy/modules/contrib/arpwatch.fc b/policy/modules/contrib/arpwatch.fc
220index a86a6c7..8630d3e 100644
221--- a/policy/modules/contrib/arpwatch.fc
222+++ b/policy/modules/contrib/arpwatch.fc
223@@ -1,4 +1,4 @@
224-/etc/rc\.d/init\.d/arpwatch -- gen_context(system_u:object_r:arpwatch_initrc_exec_t,s0)
225+/etc/init\.d/arpwatch -- gen_context(system_u:object_r:arpwatch_initrc_exec_t,s0)
226
227 #
228 # /usr
229diff --git a/policy/modules/contrib/asterisk.fc b/policy/modules/contrib/asterisk.fc
230index b4889d4..dfa4a21 100644
231--- a/policy/modules/contrib/asterisk.fc
232+++ b/policy/modules/contrib/asterisk.fc
233@@ -1,5 +1,5 @@
234 /etc/asterisk(/.*)? gen_context(system_u:object_r:asterisk_etc_t,s0)
235-/etc/rc\.d/init\.d/asterisk -- gen_context(system_u:object_r:asterisk_initrc_exec_t,s0)
236+/etc/init\.d/asterisk -- gen_context(system_u:object_r:asterisk_initrc_exec_t,s0)
237
238 /usr/sbin/asterisk -- gen_context(system_u:object_r:asterisk_exec_t,s0)
239
240diff --git a/policy/modules/contrib/automount.fc b/policy/modules/contrib/automount.fc
241index f16ab68..da0eb61 100644
242--- a/policy/modules/contrib/automount.fc
243+++ b/policy/modules/contrib/automount.fc
244@@ -2,7 +2,7 @@
245 # /etc
246 #
247 /etc/apm/event\.d/autofs -- gen_context(system_u:object_r:automount_exec_t,s0)
248-/etc/rc\.d/init\.d/autofs -- gen_context(system_u:object_r:automount_initrc_exec_t,s0)
249+/etc/init\.d/autofs -- gen_context(system_u:object_r:automount_initrc_exec_t,s0)
250
251 #
252 # /usr
253diff --git a/policy/modules/contrib/avahi.fc b/policy/modules/contrib/avahi.fc
254index 7e36549..3a54343 100644
255--- a/policy/modules/contrib/avahi.fc
256+++ b/policy/modules/contrib/avahi.fc
257@@ -1,4 +1,4 @@
258-/etc/rc\.d/init\.d/avahi.* -- gen_context(system_u:object_r:avahi_initrc_exec_t,s0)
259+/etc/init\.d/avahi.* -- gen_context(system_u:object_r:avahi_initrc_exec_t,s0)
260
261 /usr/sbin/avahi-daemon -- gen_context(system_u:object_r:avahi_exec_t,s0)
262 /usr/sbin/avahi-dnsconfd -- gen_context(system_u:object_r:avahi_exec_t,s0)
263diff --git a/policy/modules/contrib/bind.fc b/policy/modules/contrib/bind.fc
264index 59aa54f..7048407 100644
265--- a/policy/modules/contrib/bind.fc
266+++ b/policy/modules/contrib/bind.fc
267@@ -1,5 +1,5 @@
268-/etc/rc\.d/init\.d/named -- gen_context(system_u:object_r:named_initrc_exec_t,s0)
269-/etc/rc\.d/init\.d/unbound -- gen_context(system_u:object_r:named_initrc_exec_t,s0)
270+/etc/init\.d/named -- gen_context(system_u:object_r:named_initrc_exec_t,s0)
271+/etc/init\.d/unbound -- gen_context(system_u:object_r:named_initrc_exec_t,s0)
272
273 /etc/rndc.* -- gen_context(system_u:object_r:named_conf_t,s0)
274 /etc/rndc\.key -- gen_context(system_u:object_r:dnssec_t,s0)
275diff --git a/policy/modules/contrib/bitlbee.fc b/policy/modules/contrib/bitlbee.fc
276index 0197980..f302014 100644
277--- a/policy/modules/contrib/bitlbee.fc
278+++ b/policy/modules/contrib/bitlbee.fc
279@@ -1,4 +1,4 @@
280-/etc/rc\.d/init\.d/bitlbee -- gen_context(system_u:object_r:bitlbee_initrc_exec_t,s0)
281+/etc/init\.d/bitlbee -- gen_context(system_u:object_r:bitlbee_initrc_exec_t,s0)
282 /etc/bitlbee(/.*)? gen_context(system_u:object_r:bitlbee_conf_t,s0)
283
284 /usr/sbin/bitlbee -- gen_context(system_u:object_r:bitlbee_exec_t,s0)
285diff --git a/policy/modules/contrib/bluetooth.fc b/policy/modules/contrib/bluetooth.fc
286index dc687e6..6a935c6 100644
287--- a/policy/modules/contrib/bluetooth.fc
288+++ b/policy/modules/contrib/bluetooth.fc
289@@ -3,9 +3,9 @@
290 #
291 /etc/bluetooth(/.*)? gen_context(system_u:object_r:bluetooth_conf_t,s0)
292 /etc/bluetooth/link_key gen_context(system_u:object_r:bluetooth_conf_rw_t,s0)
293-/etc/rc\.d/init\.d/bluetooth -- gen_context(system_u:object_r:bluetooth_initrc_exec_t,s0)
294-/etc/rc\.d/init\.d/dund -- gen_context(system_u:object_r:bluetooth_initrc_exec_t,s0)
295-/etc/rc\.d/init\.d/pand -- gen_context(system_u:object_r:bluetooth_initrc_exec_t,s0)
296+/etc/init\.d/bluetooth -- gen_context(system_u:object_r:bluetooth_initrc_exec_t,s0)
297+/etc/init\.d/dund -- gen_context(system_u:object_r:bluetooth_initrc_exec_t,s0)
298+/etc/init\.d/pand -- gen_context(system_u:object_r:bluetooth_initrc_exec_t,s0)
299
300 #
301 # /usr
302diff --git a/policy/modules/contrib/canna.fc b/policy/modules/contrib/canna.fc
303index 5432d0e..3ee5d32 100644
304--- a/policy/modules/contrib/canna.fc
305+++ b/policy/modules/contrib/canna.fc
306@@ -1,4 +1,4 @@
307-/etc/rc\.d/init\.d/canna -- gen_context(system_u:object_r:canna_initrc_exec_t,s0)
308+/etc/init\.d/canna -- gen_context(system_u:object_r:canna_initrc_exec_t,s0)
309
310 #
311 # /usr
312diff --git a/policy/modules/contrib/certmaster.fc b/policy/modules/contrib/certmaster.fc
313index 79295d6..62f31c4 100644
314--- a/policy/modules/contrib/certmaster.fc
315+++ b/policy/modules/contrib/certmaster.fc
316@@ -1,5 +1,5 @@
317 /etc/certmaster(/.*)? gen_context(system_u:object_r:certmaster_etc_rw_t,s0)
318-/etc/rc\.d/init\.d/certmaster -- gen_context(system_u:object_r:certmaster_initrc_exec_t,s0)
319+/etc/init\.d/certmaster -- gen_context(system_u:object_r:certmaster_initrc_exec_t,s0)
320
321 /usr/bin/certmaster -- gen_context(system_u:object_r:certmaster_exec_t,s0)
322
323diff --git a/policy/modules/contrib/certmonger.fc b/policy/modules/contrib/certmonger.fc
324index 5ad1a52..364d6ea 100644
325--- a/policy/modules/contrib/certmonger.fc
326+++ b/policy/modules/contrib/certmonger.fc
327@@ -1,4 +1,4 @@
328-/etc/rc\.d/init\.d/certmonger -- gen_context(system_u:object_r:certmonger_initrc_exec_t,s0)
329+/etc/init\.d/certmonger -- gen_context(system_u:object_r:certmonger_initrc_exec_t,s0)
330
331 /usr/sbin/certmonger -- gen_context(system_u:object_r:certmonger_exec_t,s0)
332
333diff --git a/policy/modules/contrib/cgroup.fc b/policy/modules/contrib/cgroup.fc
334index b6bb46c..b719601 100644
335--- a/policy/modules/contrib/cgroup.fc
336+++ b/policy/modules/contrib/cgroup.fc
337@@ -4,8 +4,8 @@
338 /etc/sysconfig/cgconfig -- gen_context(system_u:object_r:cgconfig_etc_t,s0)
339 /etc/sysconfig/cgred.conf -- gen_context(system_u:object_r:cgrules_etc_t,s0)
340
341-/etc/rc\.d/init\.d/cgconfig -- gen_context(system_u:object_r:cgconfig_initrc_exec_t,s0)
342-/etc/rc\.d/init\.d/cgred -- gen_context(system_u:object_r:cgred_initrc_exec_t,s0)
343+/etc/init\.d/cgconfig -- gen_context(system_u:object_r:cgconfig_initrc_exec_t,s0)
344+/etc/init\.d/cgred -- gen_context(system_u:object_r:cgred_initrc_exec_t,s0)
345
346 /sbin/cgconfigparser -- gen_context(system_u:object_r:cgconfig_exec_t,s0)
347 /sbin/cgrulesengd -- gen_context(system_u:object_r:cgred_exec_t,s0)
348diff --git a/policy/modules/contrib/chronyd.fc b/policy/modules/contrib/chronyd.fc
349index fd8cd0b..27117fb 100644
350--- a/policy/modules/contrib/chronyd.fc
351+++ b/policy/modules/contrib/chronyd.fc
352@@ -1,6 +1,6 @@
353 /etc/chrony\.keys -- gen_context(system_u:object_r:chronyd_keys_t,s0)
354
355-/etc/rc\.d/init\.d/chronyd -- gen_context(system_u:object_r:chronyd_initrc_exec_t,s0)
356+/etc/init\.d/chronyd -- gen_context(system_u:object_r:chronyd_initrc_exec_t,s0)
357
358 /usr/sbin/chronyd -- gen_context(system_u:object_r:chronyd_exec_t,s0)
359
360diff --git a/policy/modules/contrib/clamav.fc b/policy/modules/contrib/clamav.fc
361index e8e9a21..ae7a9af 100644
362--- a/policy/modules/contrib/clamav.fc
363+++ b/policy/modules/contrib/clamav.fc
364@@ -1,5 +1,5 @@
365 /etc/clamav(/.*)? gen_context(system_u:object_r:clamd_etc_t,s0)
366-/etc/rc\.d/init\.d/clamd-wrapper -- gen_context(system_u:object_r:clamd_initrc_exec_t,s0)
367+/etc/init\.d/clamd-wrapper -- gen_context(system_u:object_r:clamd_initrc_exec_t,s0)
368
369 /usr/bin/clamscan -- gen_context(system_u:object_r:clamscan_exec_t,s0)
370 /usr/bin/clamdscan -- gen_context(system_u:object_r:clamscan_exec_t,s0)
371diff --git a/policy/modules/contrib/cmirrord.fc b/policy/modules/contrib/cmirrord.fc
372index 049e2b6..3b646e7 100644
373--- a/policy/modules/contrib/cmirrord.fc
374+++ b/policy/modules/contrib/cmirrord.fc
375@@ -1,4 +1,4 @@
376-/etc/rc\.d/init\.d/cmirrord -- gen_context(system_u:object_r:cmirrord_initrc_exec_t,s0)
377+/etc/init\.d/cmirrord -- gen_context(system_u:object_r:cmirrord_initrc_exec_t,s0)
378
379 /usr/sbin/cmirrord -- gen_context(system_u:object_r:cmirrord_exec_t,s0)
380
381diff --git a/policy/modules/contrib/cobbler.fc b/policy/modules/contrib/cobbler.fc
382index 1cf6c4e..0911c4a 100644
383--- a/policy/modules/contrib/cobbler.fc
384+++ b/policy/modules/contrib/cobbler.fc
385@@ -1,5 +1,5 @@
386 /etc/cobbler(/.*)? gen_context(system_u:object_r:cobbler_etc_t, s0)
387-/etc/rc\.d/init\.d/cobblerd -- gen_context(system_u:object_r:cobblerd_initrc_exec_t, s0)
388+/etc/init\.d/cobblerd -- gen_context(system_u:object_r:cobblerd_initrc_exec_t, s0)
389
390 /usr/bin/cobblerd -- gen_context(system_u:object_r:cobblerd_exec_t, s0)
391
392diff --git a/policy/modules/contrib/corosync.fc b/policy/modules/contrib/corosync.fc
393index 3a6d7eb..499b877 100644
394--- a/policy/modules/contrib/corosync.fc
395+++ b/policy/modules/contrib/corosync.fc
396@@ -1,4 +1,4 @@
397-/etc/rc\.d/init\.d/corosync -- gen_context(system_u:object_r:corosync_initrc_exec_t,s0)
398+/etc/init\.d/corosync -- gen_context(system_u:object_r:corosync_initrc_exec_t,s0)
399
400 /usr/sbin/corosync -- gen_context(system_u:object_r:corosync_exec_t,s0)
401
402diff --git a/policy/modules/contrib/cron.fc b/policy/modules/contrib/cron.fc
403index 3559a05..e4f36d2 100644
404--- a/policy/modules/contrib/cron.fc
405+++ b/policy/modules/contrib/cron.fc
406@@ -1,4 +1,4 @@
407-/etc/rc\.d/init\.d/atd -- gen_context(system_u:object_r:crond_initrc_exec_t,s0)
408+/etc/init\.d/atd -- gen_context(system_u:object_r:crond_initrc_exec_t,s0)
409
410 /etc/cron\.d(/.*)? gen_context(system_u:object_r:system_cron_spool_t,s0)
411 /etc/crontab -- gen_context(system_u:object_r:system_cron_spool_t,s0)
412diff --git a/policy/modules/contrib/cups.fc b/policy/modules/contrib/cups.fc
413index 1b492ed..5296a37 100644
414--- a/policy/modules/contrib/cups.fc
415+++ b/policy/modules/contrib/cups.fc
416@@ -11,7 +11,7 @@
417 /etc/cups/subscriptions.* -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
418 /etc/cups/certs -d gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
419 /etc/cups/certs/.* -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
420-/etc/rc\.d/init\.d/cups -- gen_context(system_u:object_r:cupsd_initrc_exec_t,s0)
421+/etc/init\.d/cups -- gen_context(system_u:object_r:cupsd_initrc_exec_t,s0)
422
423 /etc/cups/interfaces(/.*)? gen_context(system_u:object_r:cupsd_interface_t,s0)
424
425diff --git a/policy/modules/contrib/cyrus.fc b/policy/modules/contrib/cyrus.fc
426index 25546bc..390aa97 100644
427--- a/policy/modules/contrib/cyrus.fc
428+++ b/policy/modules/contrib/cyrus.fc
429@@ -1,4 +1,4 @@
430-/etc/rc\.d/init\.d/cyrus -- gen_context(system_u:object_r:cyrus_initrc_exec_t,s0)
431+/etc/init\.d/cyrus -- gen_context(system_u:object_r:cyrus_initrc_exec_t,s0)
432
433 /usr/lib(64)?/cyrus/master -- gen_context(system_u:object_r:cyrus_exec_t,s0)
434 /usr/lib(64)?/cyrus-imapd/cyrus-master -- gen_context(system_u:object_r:cyrus_exec_t,s0)
435diff --git a/policy/modules/contrib/ddclient.fc b/policy/modules/contrib/ddclient.fc
436index 083c135..0943d1f 100644
437--- a/policy/modules/contrib/ddclient.fc
438+++ b/policy/modules/contrib/ddclient.fc
439@@ -1,6 +1,6 @@
440 /etc/ddclient\.conf -- gen_context(system_u:object_r:ddclient_etc_t,s0)
441 /etc/ddtcd\.conf -- gen_context(system_u:object_r:ddclient_etc_t,s0)
442-/etc/rc\.d/init\.d/ddclient -- gen_context(system_u:object_r:ddclient_initrc_exec_t,s0)
443+/etc/init\.d/ddclient -- gen_context(system_u:object_r:ddclient_initrc_exec_t,s0)
444
445 /usr/sbin/ddclient -- gen_context(system_u:object_r:ddclient_exec_t,s0)
446 /usr/sbin/ddtcd -- gen_context(system_u:object_r:ddclient_exec_t,s0)
447diff --git a/policy/modules/contrib/denyhosts.fc b/policy/modules/contrib/denyhosts.fc
448index 257fef6..99f81a4 100644
449--- a/policy/modules/contrib/denyhosts.fc
450+++ b/policy/modules/contrib/denyhosts.fc
451@@ -1,4 +1,4 @@
452-/etc/rc\.d/init\.d/denyhosts -- gen_context(system_u:object_r:denyhosts_initrc_exec_t,s0)
453+/etc/init\.d/denyhosts -- gen_context(system_u:object_r:denyhosts_initrc_exec_t,s0)
454
455 /usr/bin/denyhosts\.py -- gen_context(system_u:object_r:denyhosts_exec_t,s0)
456
457diff --git a/policy/modules/contrib/dhcp.fc b/policy/modules/contrib/dhcp.fc
458index 767e0c7..75aedae 100644
459--- a/policy/modules/contrib/dhcp.fc
460+++ b/policy/modules/contrib/dhcp.fc
461@@ -1,4 +1,4 @@
462-/etc/rc\.d/init\.d/dhcpd -- gen_context(system_u:object_r:dhcpd_initrc_exec_t,s0)
463+/etc/init\.d/dhcpd -- gen_context(system_u:object_r:dhcpd_initrc_exec_t,s0)
464
465 /usr/sbin/dhcpd.* -- gen_context(system_u:object_r:dhcpd_exec_t,s0)
466
467diff --git a/policy/modules/contrib/dictd.fc b/policy/modules/contrib/dictd.fc
468index 54f88c8..f2abcad 100644
469--- a/policy/modules/contrib/dictd.fc
470+++ b/policy/modules/contrib/dictd.fc
471@@ -1,4 +1,4 @@
472-/etc/rc\.d/init\.d/dictd -- gen_context(system_u:object_r:dictd_initrc_exec_t,s0)
473+/etc/init\.d/dictd -- gen_context(system_u:object_r:dictd_initrc_exec_t,s0)
474
475 /etc/dictd\.conf -- gen_context(system_u:object_r:dictd_etc_t,s0)
476
477diff --git a/policy/modules/contrib/dnsmasq.fc b/policy/modules/contrib/dnsmasq.fc
478index b886676..5156a75 100644
479--- a/policy/modules/contrib/dnsmasq.fc
480+++ b/policy/modules/contrib/dnsmasq.fc
481@@ -1,5 +1,5 @@
482 /etc/dnsmasq\.conf -- gen_context(system_u:object_r:dnsmasq_etc_t, s0)
483-/etc/rc\.d/init\.d/dnsmasq -- gen_context(system_u:object_r:dnsmasq_initrc_exec_t,s0)
484+/etc/init\.d/dnsmasq -- gen_context(system_u:object_r:dnsmasq_initrc_exec_t,s0)
485
486 /usr/sbin/dnsmasq -- gen_context(system_u:object_r:dnsmasq_exec_t,s0)
487
488diff --git a/policy/modules/contrib/dovecot.fc b/policy/modules/contrib/dovecot.fc
489index 3a3ecb2..df878f7 100644
490--- a/policy/modules/contrib/dovecot.fc
491+++ b/policy/modules/contrib/dovecot.fc
492@@ -7,7 +7,7 @@
493 /etc/dovecot\.passwd.* gen_context(system_u:object_r:dovecot_passwd_t,s0)
494
495 /etc/pki/dovecot(/.*)? gen_context(system_u:object_r:dovecot_cert_t,s0)
496-/etc/rc\.d/init\.d/dovecot -- gen_context(system_u:object_r:dovecot_initrc_exec_t,s0)
497+/etc/init\.d/dovecot -- gen_context(system_u:object_r:dovecot_initrc_exec_t,s0)
498
499 # Debian uses /etc/dovecot/
500 ifdef(`distro_debian',`
501diff --git a/policy/modules/contrib/fail2ban.fc b/policy/modules/contrib/fail2ban.fc
502index 0de2b83..bac352b 100644
503--- a/policy/modules/contrib/fail2ban.fc
504+++ b/policy/modules/contrib/fail2ban.fc
505@@ -1,4 +1,4 @@
506-/etc/rc\.d/init\.d/fail2ban -- gen_context(system_u:object_r:fail2ban_initrc_exec_t,s0)
507+/etc/init\.d/fail2ban -- gen_context(system_u:object_r:fail2ban_initrc_exec_t,s0)
508
509 /usr/bin/fail2ban -- gen_context(system_u:object_r:fail2ban_exec_t,s0)
510 /usr/bin/fail2ban-server -- gen_context(system_u:object_r:fail2ban_exec_t,s0)
511diff --git a/policy/modules/contrib/ftp.fc b/policy/modules/contrib/ftp.fc
512index 69dcd2a..d5e2f41 100644
513--- a/policy/modules/contrib/ftp.fc
514+++ b/policy/modules/contrib/ftp.fc
515@@ -3,8 +3,8 @@
516 #
517 /etc/proftpd\.conf -- gen_context(system_u:object_r:ftpd_etc_t,s0)
518 /etc/cron\.monthly/proftpd -- gen_context(system_u:object_r:ftpd_exec_t,s0)
519-/etc/rc\.d/init\.d/vsftpd -- gen_context(system_u:object_r:ftpd_initrc_exec_t,s0)
520-/etc/rc\.d/init\.d/proftpd -- gen_context(system_u:object_r:ftpd_initrc_exec_t,s0)
521+/etc/init\.d/vsftpd -- gen_context(system_u:object_r:ftpd_initrc_exec_t,s0)
522+/etc/init\.d/proftpd -- gen_context(system_u:object_r:ftpd_initrc_exec_t,s0)
523
524 #
525 # /usr
526diff --git a/policy/modules/contrib/glance.fc b/policy/modules/contrib/glance.fc
527index ed3528d..8dc0e2e 100644
528--- a/policy/modules/contrib/glance.fc
529+++ b/policy/modules/contrib/glance.fc
530@@ -1,6 +1,6 @@
531-/etc/rc\.d/init\.d/openstack-glance-api -- gen_context(system_u:object_r:glance_api_initrc_exec_t,s0)
532+/etc/init\.d/openstack-glance-api -- gen_context(system_u:object_r:glance_api_initrc_exec_t,s0)
533
534-/etc/rc\.d/init\.d/openstack-glance-registry -- gen_context(system_u:object_r:glance_registry_initrc_exec_t,s0)
535+/etc/init\.d/openstack-glance-registry -- gen_context(system_u:object_r:glance_registry_initrc_exec_t,s0)
536
537 /usr/bin/glance-api -- gen_context(system_u:object_r:glance_api_exec_t,s0)
538 /usr/bin/glance-registry -- gen_context(system_u:object_r:glance_registry_exec_t,s0)
539diff --git a/policy/modules/contrib/gpsd.fc b/policy/modules/contrib/gpsd.fc
540index 5e81e33..5dc42e0 100644
541--- a/policy/modules/contrib/gpsd.fc
542+++ b/policy/modules/contrib/gpsd.fc
543@@ -1,4 +1,4 @@
544-/etc/rc\.d/init\.d/gpsd -- gen_context(system_u:object_r:gpsd_initrc_exec_t,s0)
545+/etc/init\.d/gpsd -- gen_context(system_u:object_r:gpsd_initrc_exec_t,s0)
546
547 /usr/sbin/gpsd -- gen_context(system_u:object_r:gpsd_exec_t,s0)
548
549diff --git a/policy/modules/contrib/hadoop.fc b/policy/modules/contrib/hadoop.fc
550index 633c470..dc02c13 100644
551--- a/policy/modules/contrib/hadoop.fc
552+++ b/policy/modules/contrib/hadoop.fc
553@@ -7,13 +7,6 @@
554 /etc/init\.d/hadoop-(.*-)?tasktracker -- gen_context(system_u:object_r:hadoop_tasktracker_initrc_exec_t,s0)
555 /etc/init\.d/zookeeper -- gen_context(system_u:object_r:zookeeper_server_initrc_exec_t,s0)
556
557-/etc/rc\.d/init\.d/hadoop-(.*-)?datanode -- gen_context(system_u:object_r:hadoop_datanode_initrc_exec_t,s0)
558-/etc/rc\.d/init\.d/hadoop-(.*-)?jobtracker -- gen_context(system_u:object_r:hadoop_jobtracker_initrc_exec_t,s0)
559-/etc/rc\.d/init\.d/hadoop-(.*-)?namenode -- gen_context(system_u:object_r:hadoop_namenode_initrc_exec_t,s0)
560-/etc/rc\.d/init\.d/hadoop-(.*-)?secondarynamenode -- gen_context(system_u:object_r:hadoop_secondarynamenode_initrc_exec_t,s0)
561-/etc/rc\.d/init\.d/hadoop-(.*-)?tasktracker -- gen_context(system_u:object_r:hadoop_tasktracker_initrc_exec_t,s0)
562-/etc/rc\.d/init\.d/hadoop-zookeeper -- gen_context(system_u:object_r:zookeeper_server_initrc_exec_t,s0)
563-
564 /etc/zookeeper(/.*)? gen_context(system_u:object_r:zookeeper_etc_t,s0)
565 /etc/zookeeper\.dist(/.*)? gen_context(system_u:object_r:zookeeper_etc_t,s0)
566
567diff --git a/policy/modules/contrib/hddtemp.fc b/policy/modules/contrib/hddtemp.fc
568index 1676612..974c301 100644
569--- a/policy/modules/contrib/hddtemp.fc
570+++ b/policy/modules/contrib/hddtemp.fc
571@@ -1,4 +1,4 @@
572-/etc/rc\.d/init\.d/hddtemp -- gen_context(system_u:object_r:hddtemp_initrc_exec_t,s0)
573+/etc/init\.d/hddtemp -- gen_context(system_u:object_r:hddtemp_initrc_exec_t,s0)
574
575 /etc/sysconfig/hddtemp -- gen_context(system_u:object_r:hddtemp_etc_t,s0)
576
577diff --git a/policy/modules/contrib/icecast.fc b/policy/modules/contrib/icecast.fc
578index a81e090..3ee6b19 100644
579--- a/policy/modules/contrib/icecast.fc
580+++ b/policy/modules/contrib/icecast.fc
581@@ -1,4 +1,4 @@
582-/etc/rc\.d/init\.d/icecast -- gen_context(system_u:object_r:icecast_initrc_exec_t,s0)
583+/etc/init\.d/icecast -- gen_context(system_u:object_r:icecast_initrc_exec_t,s0)
584
585 /usr/bin/icecast -- gen_context(system_u:object_r:icecast_exec_t,s0)
586
587diff --git a/policy/modules/contrib/ifplugd.fc b/policy/modules/contrib/ifplugd.fc
588index 2eda96f..5430948 100644
589--- a/policy/modules/contrib/ifplugd.fc
590+++ b/policy/modules/contrib/ifplugd.fc
591@@ -1,6 +1,6 @@
592 /etc/ifplugd(/.*)? gen_context(system_u:object_r:ifplugd_etc_t,s0)
593
594-/etc/rc\.d/init\.d/ifplugd -- gen_context(system_u:object_r:ifplugd_initrc_exec_t,s0)
595+/etc/init\.d/ifplugd -- gen_context(system_u:object_r:ifplugd_initrc_exec_t,s0)
596
597 /usr/sbin/ifplugd -- gen_context(system_u:object_r:ifplugd_exec_t,s0)
598
599diff --git a/policy/modules/contrib/inn.fc b/policy/modules/contrib/inn.fc
600index 8ca038d..1c11006 100644
601--- a/policy/modules/contrib/inn.fc
602+++ b/policy/modules/contrib/inn.fc
603@@ -4,7 +4,7 @@
604 #
605 /etc/news(/.*)? gen_context(system_u:object_r:innd_etc_t,s0)
606 /etc/news/boot -- gen_context(system_u:object_r:innd_exec_t,s0)
607-/etc/rc\.d/init\.d/innd -- gen_context(system_u:object_r:innd_initrc_exec_t,s0)
608+/etc/init\.d/innd -- gen_context(system_u:object_r:innd_initrc_exec_t,s0)
609
610 #
611 # /usr
612diff --git a/policy/modules/contrib/jabber.fc b/policy/modules/contrib/jabber.fc
613index da6f4b4..e27b77f 100644
614--- a/policy/modules/contrib/jabber.fc
615+++ b/policy/modules/contrib/jabber.fc
616@@ -1,4 +1,4 @@
617-/etc/rc\.d/init\.d/jabber -- gen_context(system_u:object_r:jabberd_initrc_exec_t,s0)
618+/etc/init\.d/jabber -- gen_context(system_u:object_r:jabberd_initrc_exec_t,s0)
619
620 /usr/sbin/ejabberd -- gen_context(system_u:object_r:jabberd_exec_t,s0)
621 /usr/sbin/jabberd -- gen_context(system_u:object_r:jabberd_exec_t,s0)
622diff --git a/policy/modules/contrib/kdump.fc b/policy/modules/contrib/kdump.fc
623index c66934f..21ea646 100644
624--- a/policy/modules/contrib/kdump.fc
625+++ b/policy/modules/contrib/kdump.fc
626@@ -1,5 +1,5 @@
627 /etc/kdump\.conf -- gen_context(system_u:object_r:kdump_etc_t,s0)
628-/etc/rc\.d/init\.d/kdump -- gen_context(system_u:object_r:kdump_initrc_exec_t,s0)
629+/etc/init\.d/kdump -- gen_context(system_u:object_r:kdump_initrc_exec_t,s0)
630
631 /sbin/kdump -- gen_context(system_u:object_r:kdump_exec_t,s0)
632 /sbin/kexec -- gen_context(system_u:object_r:kdump_exec_t,s0)
633diff --git a/policy/modules/contrib/kerberos.fc b/policy/modules/contrib/kerberos.fc
634index 3525d24..1331079 100644
635--- a/policy/modules/contrib/kerberos.fc
636+++ b/policy/modules/contrib/kerberos.fc
637@@ -8,10 +8,10 @@ HOME_DIR/\.k5login -- gen_context(system_u:object_r:krb5_home_t,s0)
638 /etc/krb5kdc/kadm5\.keytab -- gen_context(system_u:object_r:krb5_keytab_t,s0)
639 /etc/krb5kdc/principal.* gen_context(system_u:object_r:krb5kdc_principal_t,s0)
640
641-/etc/rc\.d/init\.d/kadmind -- gen_context(system_u:object_r:kerberos_initrc_exec_t,s0)
642-/etc/rc\.d/init\.d/kprop -- gen_context(system_u:object_r:kerberos_initrc_exec_t,s0)
643-/etc/rc\.d/init\.d/krb524d -- gen_context(system_u:object_r:kerberos_initrc_exec_t,s0)
644-/etc/rc\.d/init\.d/krb5kdc -- gen_context(system_u:object_r:kerberos_initrc_exec_t,s0)
645+/etc/init\.d/kadmind -- gen_context(system_u:object_r:kerberos_initrc_exec_t,s0)
646+/etc/init\.d/kprop -- gen_context(system_u:object_r:kerberos_initrc_exec_t,s0)
647+/etc/init\.d/krb524d -- gen_context(system_u:object_r:kerberos_initrc_exec_t,s0)
648+/etc/init\.d/krb5kdc -- gen_context(system_u:object_r:kerberos_initrc_exec_t,s0)
649
650 /usr/(local/)?(kerberos/)?sbin/krb5kdc -- gen_context(system_u:object_r:krb5kdc_exec_t,s0)
651 /usr/(local/)?(kerberos/)?sbin/kadmind -- gen_context(system_u:object_r:kadmind_exec_t,s0)
652diff --git a/policy/modules/contrib/kerneloops.fc b/policy/modules/contrib/kerneloops.fc
653index 5ef261a..adc4cdc 100644
654--- a/policy/modules/contrib/kerneloops.fc
655+++ b/policy/modules/contrib/kerneloops.fc
656@@ -1,3 +1,3 @@
657-/etc/rc\.d/init\.d/kerneloops -- gen_context(system_u:object_r:kerneloops_initrc_exec_t,s0)
658+/etc/init\.d/kerneloops -- gen_context(system_u:object_r:kerneloops_initrc_exec_t,s0)
659
660 /usr/sbin/kerneloops -- gen_context(system_u:object_r:kerneloops_exec_t,s0)
661diff --git a/policy/modules/contrib/ksmtuned.fc b/policy/modules/contrib/ksmtuned.fc
662index 9c0c835..d129dfb 100644
663--- a/policy/modules/contrib/ksmtuned.fc
664+++ b/policy/modules/contrib/ksmtuned.fc
665@@ -1,4 +1,4 @@
666-/etc/rc\.d/init\.d/ksmtuned -- gen_context(system_u:object_r:ksmtuned_initrc_exec_t,s0)
667+/etc/init\.d/ksmtuned -- gen_context(system_u:object_r:ksmtuned_initrc_exec_t,s0)
668
669 /usr/sbin/ksmtuned -- gen_context(system_u:object_r:ksmtuned_exec_t,s0)
670
671diff --git a/policy/modules/contrib/ldap.fc b/policy/modules/contrib/ldap.fc
672index c62f23e..589e3fd 100644
673--- a/policy/modules/contrib/ldap.fc
674+++ b/policy/modules/contrib/ldap.fc
675@@ -1,6 +1,6 @@
676
677 /etc/ldap/slapd\.conf -- gen_context(system_u:object_r:slapd_etc_t,s0)
678-/etc/rc\.d/init\.d/ldap -- gen_context(system_u:object_r:slapd_initrc_exec_t,s0)
679+/etc/init\.d/ldap -- gen_context(system_u:object_r:slapd_initrc_exec_t,s0)
680
681 /usr/sbin/slapd -- gen_context(system_u:object_r:slapd_exec_t,s0)
682
683diff --git a/policy/modules/contrib/likewise.fc b/policy/modules/contrib/likewise.fc
684index 057a4e4..a42c46a 100644
685--- a/policy/modules/contrib/likewise.fc
686+++ b/policy/modules/contrib/likewise.fc
687@@ -2,14 +2,14 @@
688 /etc/likewise-open/.pstore.lock -- gen_context(system_u:object_r:likewise_pstore_lock_t,s0)
689 /etc/likewise-open/likewise-krb5-ad.conf -- gen_context(system_u:object_r:likewise_krb5_ad_t,s0)
690
691-/etc/rc\.d/init\.d/dcerpcd -- gen_context(system_u:object_r:likewise_initrc_exec_t,s0)
692-/etc/rc\.d/init\.d/eventlogd -- gen_context(system_u:object_r:likewise_initrc_exec_t,s0)
693-/etc/rc\.d/init\.d/lsassd -- gen_context(system_u:object_r:likewise_initrc_exec_t,s0)
694-/etc/rc\.d/init\.d/lwiod -- gen_context(system_u:object_r:likewise_initrc_exec_t,s0)
695-/etc/rc\.d/init\.d/lwregd -- gen_context(system_u:object_r:likewise_initrc_exec_t,s0)
696-/etc/rc\.d/init\.d/lwsmd -- gen_context(system_u:object_r:likewise_initrc_exec_t,s0)
697-/etc/rc\.d/init\.d/netlogond -- gen_context(system_u:object_r:likewise_initrc_exec_t,s0)
698-/etc/rc\.d/init\.d/srvsvcd -- gen_context(system_u:object_r:likewise_initrc_exec_t,s0)
699+/etc/init\.d/dcerpcd -- gen_context(system_u:object_r:likewise_initrc_exec_t,s0)
700+/etc/init\.d/eventlogd -- gen_context(system_u:object_r:likewise_initrc_exec_t,s0)
701+/etc/init\.d/lsassd -- gen_context(system_u:object_r:likewise_initrc_exec_t,s0)
702+/etc/init\.d/lwiod -- gen_context(system_u:object_r:likewise_initrc_exec_t,s0)
703+/etc/init\.d/lwregd -- gen_context(system_u:object_r:likewise_initrc_exec_t,s0)
704+/etc/init\.d/lwsmd -- gen_context(system_u:object_r:likewise_initrc_exec_t,s0)
705+/etc/init\.d/netlogond -- gen_context(system_u:object_r:likewise_initrc_exec_t,s0)
706+/etc/init\.d/srvsvcd -- gen_context(system_u:object_r:likewise_initrc_exec_t,s0)
707
708 /usr/sbin/dcerpcd -- gen_context(system_u:object_r:dcerpcd_exec_t,s0)
709 /usr/sbin/eventlogd -- gen_context(system_u:object_r:eventlogd_exec_t,s0)
710diff --git a/policy/modules/contrib/lircd.fc b/policy/modules/contrib/lircd.fc
711index 49e04e5..501a11f 100644
712--- a/policy/modules/contrib/lircd.fc
713+++ b/policy/modules/contrib/lircd.fc
714@@ -1,6 +1,6 @@
715 /dev/lircd -s gen_context(system_u:object_r:lircd_sock_t,s0)
716
717-/etc/rc\.d/init\.d/lirc -- gen_context(system_u:object_r:lircd_initrc_exec_t,s0)
718+/etc/init\.d/lirc -- gen_context(system_u:object_r:lircd_initrc_exec_t,s0)
719 /etc/lircd\.conf -- gen_context(system_u:object_r:lircd_etc_t,s0)
720
721 /usr/sbin/lircd -- gen_context(system_u:object_r:lircd_exec_t,s0)
722diff --git a/policy/modules/contrib/memcached.fc b/policy/modules/contrib/memcached.fc
723index 4d69477..b814405 100644
724--- a/policy/modules/contrib/memcached.fc
725+++ b/policy/modules/contrib/memcached.fc
726@@ -1,4 +1,4 @@
727-/etc/rc\.d/init\.d/memcached -- gen_context(system_u:object_r:memcached_initrc_exec_t,s0)
728+/etc/init\.d/memcached -- gen_context(system_u:object_r:memcached_initrc_exec_t,s0)
729
730 /usr/bin/memcached -- gen_context(system_u:object_r:memcached_exec_t,s0)
731
732diff --git a/policy/modules/contrib/mpd.fc b/policy/modules/contrib/mpd.fc
733index ddc14d6..dfffdf3 100644
734--- a/policy/modules/contrib/mpd.fc
735+++ b/policy/modules/contrib/mpd.fc
736@@ -1,5 +1,5 @@
737 /etc/mpd\.conf -- gen_context(system_u:object_r:mpd_etc_t,s0)
738-/etc/rc\.d/init\.d/mpd -- gen_context(system_u:object_r:mpd_initrc_exec_t,s0)
739+/etc/init\.d/mpd -- gen_context(system_u:object_r:mpd_initrc_exec_t,s0)
740
741 /usr/bin/mpd -- gen_context(system_u:object_r:mpd_exec_t,s0)
742
743diff --git a/policy/modules/contrib/munin.fc b/policy/modules/contrib/munin.fc
744index fd71d69..3ab97af 100644
745--- a/policy/modules/contrib/munin.fc
746+++ b/policy/modules/contrib/munin.fc
747@@ -1,5 +1,5 @@
748 /etc/munin(/.*)? gen_context(system_u:object_r:munin_etc_t,s0)
749-/etc/rc\.d/init\.d/munin-node -- gen_context(system_u:object_r:munin_initrc_exec_t,s0)
750+/etc/init\.d/munin-node -- gen_context(system_u:object_r:munin_initrc_exec_t,s0)
751
752 /usr/bin/munin-.* -- gen_context(system_u:object_r:munin_exec_t,s0)
753 /usr/sbin/munin-.* -- gen_context(system_u:object_r:munin_exec_t,s0)
754diff --git a/policy/modules/contrib/mysql.fc b/policy/modules/contrib/mysql.fc
755index 716d666..bba693d 100644
756--- a/policy/modules/contrib/mysql.fc
757+++ b/policy/modules/contrib/mysql.fc
758@@ -5,8 +5,8 @@
759 #
760 /etc/my\.cnf -- gen_context(system_u:object_r:mysqld_etc_t,s0)
761 /etc/mysql(/.*)? gen_context(system_u:object_r:mysqld_etc_t,s0)
762-/etc/rc\.d/init\.d/mysqld -- gen_context(system_u:object_r:mysqld_initrc_exec_t,s0)
763-/etc/rc\.d/init\.d/mysqlmanager -- gen_context(system_u:object_r:mysqlmanagerd_initrc_exec_t,s0)
764+/etc/init\.d/mysqld -- gen_context(system_u:object_r:mysqld_initrc_exec_t,s0)
765+/etc/init\.d/mysqlmanager -- gen_context(system_u:object_r:mysqlmanagerd_initrc_exec_t,s0)
766
767 #
768 # /usr
769diff --git a/policy/modules/contrib/nagios.fc b/policy/modules/contrib/nagios.fc
770index 1fc9905..00cb5cb 100644
771--- a/policy/modules/contrib/nagios.fc
772+++ b/policy/modules/contrib/nagios.fc
773@@ -1,7 +1,7 @@
774 /etc/nagios(/.*)? gen_context(system_u:object_r:nagios_etc_t,s0)
775 /etc/nagios/nrpe\.cfg -- gen_context(system_u:object_r:nrpe_etc_t,s0)
776-/etc/rc\.d/init\.d/nagios -- gen_context(system_u:object_r:nagios_initrc_exec_t,s0)
777-/etc/rc\.d/init\.d/nrpe -- gen_context(system_u:object_r:nagios_initrc_exec_t,s0)
778+/etc/init\.d/nagios -- gen_context(system_u:object_r:nagios_initrc_exec_t,s0)
779+/etc/init\.d/nrpe -- gen_context(system_u:object_r:nagios_initrc_exec_t,s0)
780
781 /usr/s?bin/nagios -- gen_context(system_u:object_r:nagios_exec_t,s0)
782 /usr/s?bin/nrpe -- gen_context(system_u:object_r:nrpe_exec_t,s0)
783diff --git a/policy/modules/contrib/networkmanager.fc b/policy/modules/contrib/networkmanager.fc
784index 386543b..50e0faa 100644
785--- a/policy/modules/contrib/networkmanager.fc
786+++ b/policy/modules/contrib/networkmanager.fc
787@@ -1,4 +1,4 @@
788-/etc/rc\.d/init\.d/wicd -- gen_context(system_u:object_r:NetworkManager_initrc_exec_t,s0)
789+/etc/init\.d/wicd -- gen_context(system_u:object_r:NetworkManager_initrc_exec_t,s0)
790
791 /etc/NetworkManager/dispatcher\.d(/.*) gen_context(system_u:object_r:NetworkManager_initrc_exec_t,s0)
792
793diff --git a/policy/modules/contrib/nis.fc b/policy/modules/contrib/nis.fc
794index 15448d5..f7d6f6f 100644
795--- a/policy/modules/contrib/nis.fc
796+++ b/policy/modules/contrib/nis.fc
797@@ -1,7 +1,7 @@
798-/etc/rc\.d/init\.d/ypbind -- gen_context(system_u:object_r:ypbind_initrc_exec_t,s0)
799-/etc/rc\.d/init\.d/yppasswd -- gen_context(system_u:object_r:nis_initrc_exec_t,s0)
800-/etc/rc\.d/init\.d/ypserv -- gen_context(system_u:object_r:nis_initrc_exec_t,s0)
801-/etc/rc\.d/init\.d/ypxfrd -- gen_context(system_u:object_r:nis_initrc_exec_t,s0)
802+/etc/init\.d/ypbind -- gen_context(system_u:object_r:ypbind_initrc_exec_t,s0)
803+/etc/init\.d/yppasswd -- gen_context(system_u:object_r:nis_initrc_exec_t,s0)
804+/etc/init\.d/ypserv -- gen_context(system_u:object_r:nis_initrc_exec_t,s0)
805+/etc/init\.d/ypxfrd -- gen_context(system_u:object_r:nis_initrc_exec_t,s0)
806 /etc/ypserv\.conf -- gen_context(system_u:object_r:ypserv_conf_t,s0)
807
808 /sbin/ypbind -- gen_context(system_u:object_r:ypbind_exec_t,s0)
809diff --git a/policy/modules/contrib/nscd.fc b/policy/modules/contrib/nscd.fc
810index 623b731..6089dda 100644
811--- a/policy/modules/contrib/nscd.fc
812+++ b/policy/modules/contrib/nscd.fc
813@@ -1,4 +1,4 @@
814-/etc/rc\.d/init\.d/nscd -- gen_context(system_u:object_r:nscd_initrc_exec_t,s0)
815+/etc/init\.d/nscd -- gen_context(system_u:object_r:nscd_initrc_exec_t,s0)
816
817 /usr/sbin/nscd -- gen_context(system_u:object_r:nscd_exec_t,s0)
818
819diff --git a/policy/modules/contrib/nslcd.fc b/policy/modules/contrib/nslcd.fc
820index ce913b2..1f6e4c0 100644
821--- a/policy/modules/contrib/nslcd.fc
822+++ b/policy/modules/contrib/nslcd.fc
823@@ -1,4 +1,4 @@
824 /etc/nss-ldapd.conf -- gen_context(system_u:object_r:nslcd_conf_t,s0)
825-/etc/rc\.d/init\.d/nslcd -- gen_context(system_u:object_r:nslcd_initrc_exec_t,s0)
826+/etc/init\.d/nslcd -- gen_context(system_u:object_r:nslcd_initrc_exec_t,s0)
827 /usr/sbin/nslcd -- gen_context(system_u:object_r:nslcd_exec_t,s0)
828 /var/run/nslcd(/.*)? gen_context(system_u:object_r:nslcd_var_run_t,s0)
829diff --git a/policy/modules/contrib/ntp.fc b/policy/modules/contrib/ntp.fc
830index e79dccc..d609a67 100644
831--- a/policy/modules/contrib/ntp.fc
832+++ b/policy/modules/contrib/ntp.fc
833@@ -8,7 +8,7 @@
834 /etc/ntp/keys -- gen_context(system_u:object_r:ntpd_key_t,s0)
835 /etc/ntp/step-tickers.* -- gen_context(system_u:object_r:net_conf_t,s0)
836
837-/etc/rc\.d/init\.d/ntpd -- gen_context(system_u:object_r:ntpd_initrc_exec_t,s0)
838+/etc/init\.d/ntpd -- gen_context(system_u:object_r:ntpd_initrc_exec_t,s0)
839
840 /usr/sbin/ntpd -- gen_context(system_u:object_r:ntpd_exec_t,s0)
841 /usr/sbin/ntpdate -- gen_context(system_u:object_r:ntpdate_exec_t,s0)
842diff --git a/policy/modules/contrib/oident.fc b/policy/modules/contrib/oident.fc
843index 5840ea8..3eb8272 100644
844--- a/policy/modules/contrib/oident.fc
845+++ b/policy/modules/contrib/oident.fc
846@@ -3,6 +3,6 @@ HOME_DIR/\.oidentd.conf gen_context(system_u:object_r:oidentd_home_t, s0)
847 /etc/oidentd\.conf -- gen_context(system_u:object_r:oidentd_config_t, s0)
848 /etc/oidentd_masq\.conf -- gen_context(system_u:object_r:oidentd_config_t, s0)
849
850-/etc/rc\.d/init\.d/oidentd -- gen_context(system_u:object_r:oidentd_initrc_exec_t, s0)
851+/etc/init\.d/oidentd -- gen_context(system_u:object_r:oidentd_initrc_exec_t, s0)
852
853 /usr/sbin/oidentd -- gen_context(system_u:object_r:oidentd_exec_t, s0)
854diff --git a/policy/modules/contrib/openvpn.fc b/policy/modules/contrib/openvpn.fc
855index 1c1086e..3fafedf 100644
856--- a/policy/modules/contrib/openvpn.fc
857+++ b/policy/modules/contrib/openvpn.fc
858@@ -3,7 +3,7 @@
859 #
860 /etc/openvpn(/.*)? gen_context(system_u:object_r:openvpn_etc_t,s0)
861 /etc/openvpn/ipp.txt -- gen_context(system_u:object_r:openvpn_etc_rw_t,s0)
862-/etc/rc\.d/init\.d/openvpn -- gen_context(system_u:object_r:openvpn_initrc_exec_t,s0)
863+/etc/init\.d/openvpn -- gen_context(system_u:object_r:openvpn_initrc_exec_t,s0)
864
865 #
866 # /usr
867diff --git a/policy/modules/contrib/pads.fc b/policy/modules/contrib/pads.fc
868index 0870c56..fcedae0 100644
869--- a/policy/modules/contrib/pads.fc
870+++ b/policy/modules/contrib/pads.fc
871@@ -3,7 +3,7 @@
872 /etc/pads.conf -- gen_context(system_u:object_r:pads_config_t, s0)
873 /etc/pads-assets.csv -- gen_context(system_u:object_r:pads_config_t, s0)
874
875-/etc/rc\.d/init\.d/pads -- gen_context(system_u:object_r:pads_initrc_exec_t, s0)
876+/etc/init\.d/pads -- gen_context(system_u:object_r:pads_initrc_exec_t, s0)
877
878 /usr/bin/pads -- gen_context(system_u:object_r:pads_exec_t, s0)
879
880diff --git a/policy/modules/contrib/pingd.fc b/policy/modules/contrib/pingd.fc
881index ea085f7..55aee6d 100644
882--- a/policy/modules/contrib/pingd.fc
883+++ b/policy/modules/contrib/pingd.fc
884@@ -1,5 +1,5 @@
885 /etc/pingd.conf -- gen_context(system_u:object_r:pingd_etc_t,s0)
886-/etc/rc\.d/init\.d/whatsup-pingd -- gen_context(system_u:object_r:pingd_initrc_exec_t,s0)
887+/etc/init\.d/whatsup-pingd -- gen_context(system_u:object_r:pingd_initrc_exec_t,s0)
888
889 /usr/lib/pingd(/.*)? gen_context(system_u:object_r:pingd_modules_t,s0)
890
891diff --git a/policy/modules/contrib/portreserve.fc b/policy/modules/contrib/portreserve.fc
892index 4313a6f..3164dfb 100644
893--- a/policy/modules/contrib/portreserve.fc
894+++ b/policy/modules/contrib/portreserve.fc
895@@ -1,6 +1,6 @@
896 /etc/portreserve(/.*)? gen_context(system_u:object_r:portreserve_etc_t,s0)
897
898-/etc/rc\.d/init\.d/portreserve -- gen_context(system_u:object_r:portreserve_initrc_exec_t,s0)
899+/etc/init\.d/portreserve -- gen_context(system_u:object_r:portreserve_initrc_exec_t,s0)
900
901 /sbin/portreserve -- gen_context(system_u:object_r:portreserve_exec_t,s0)
902
903diff --git a/policy/modules/contrib/postfixpolicyd.fc b/policy/modules/contrib/postfixpolicyd.fc
904index 4361cb6..87ba723 100644
905--- a/policy/modules/contrib/postfixpolicyd.fc
906+++ b/policy/modules/contrib/postfixpolicyd.fc
907@@ -1,5 +1,5 @@
908 /etc/policyd.conf -- gen_context(system_u:object_r:postfix_policyd_conf_t, s0)
909-/etc/rc\.d/init\.d/postfixpolicyd -- gen_context(system_u:object_r:postfix_policyd_initrc_exec_t,s0)
910+/etc/init\.d/postfixpolicyd -- gen_context(system_u:object_r:postfix_policyd_initrc_exec_t,s0)
911
912 /usr/sbin/policyd -- gen_context(system_u:object_r:postfix_policyd_exec_t, s0)
913
914diff --git a/policy/modules/contrib/postgrey.fc b/policy/modules/contrib/postgrey.fc
915index e731841..757c507 100644
916--- a/policy/modules/contrib/postgrey.fc
917+++ b/policy/modules/contrib/postgrey.fc
918@@ -1,6 +1,6 @@
919
920 /etc/postgrey(/.*)? gen_context(system_u:object_r:postgrey_etc_t,s0)
921-/etc/rc\.d/init\.d/postgrey -- gen_context(system_u:object_r:postgrey_initrc_exec_t,s0)
922+/etc/init\.d/postgrey -- gen_context(system_u:object_r:postgrey_initrc_exec_t,s0)
923
924 /usr/sbin/postgrey -- gen_context(system_u:object_r:postgrey_exec_t,s0)
925
926diff --git a/policy/modules/contrib/ppp.fc b/policy/modules/contrib/ppp.fc
927index 2d82c6d..f3e40ce 100644
928--- a/policy/modules/contrib/ppp.fc
929+++ b/policy/modules/contrib/ppp.fc
930@@ -1,7 +1,7 @@
931 #
932 # /etc
933 #
934-/etc/rc\.d/init\.d/ppp -- gen_context(system_u:object_r:pppd_initrc_exec_t,s0)
935+/etc/init\.d/ppp -- gen_context(system_u:object_r:pppd_initrc_exec_t,s0)
936
937 /etc/ppp -d gen_context(system_u:object_r:pppd_etc_t,s0)
938 /etc/ppp(/.*)? -- gen_context(system_u:object_r:pppd_etc_rw_t,s0)
939diff --git a/policy/modules/contrib/prelude.fc b/policy/modules/contrib/prelude.fc
940index 3bd847a..6dc169c 100644
941--- a/policy/modules/contrib/prelude.fc
942+++ b/policy/modules/contrib/prelude.fc
943@@ -1,7 +1,7 @@
944 /etc/prelude-correlator(/.*)? gen_context(system_u:object_r:prelude_correlator_config_t, s0)
945-/etc/rc\.d/init\.d/prelude-correlator -- gen_context(system_u:object_r:prelude_initrc_exec_t, s0)
946-/etc/rc\.d/init\.d/prelude-lml -- gen_context(system_u:object_r:prelude_initrc_exec_t,s0)
947-/etc/rc\.d/init\.d/prelude-manager -- gen_context(system_u:object_r:prelude_initrc_exec_t,s0)
948+/etc/init\.d/prelude-correlator -- gen_context(system_u:object_r:prelude_initrc_exec_t, s0)
949+/etc/init\.d/prelude-lml -- gen_context(system_u:object_r:prelude_initrc_exec_t,s0)
950+/etc/init\.d/prelude-manager -- gen_context(system_u:object_r:prelude_initrc_exec_t,s0)
951
952 /sbin/audisp-prelude -- gen_context(system_u:object_r:prelude_audisp_exec_t,s0)
953
954diff --git a/policy/modules/contrib/privoxy.fc b/policy/modules/contrib/privoxy.fc
955index be4998a..5bbba5c 100644
956--- a/policy/modules/contrib/privoxy.fc
957+++ b/policy/modules/contrib/privoxy.fc
958@@ -1,5 +1,5 @@
959 /etc/privoxy/[^/]*\.action -- gen_context(system_u:object_r:privoxy_etc_rw_t,s0)
960-/etc/rc\.d/init\.d/privoxy -- gen_context(system_u:object_r:privoxy_initrc_exec_t,s0)
961+/etc/init\.d/privoxy -- gen_context(system_u:object_r:privoxy_initrc_exec_t,s0)
962
963 /usr/sbin/privoxy -- gen_context(system_u:object_r:privoxy_exec_t,s0)
964
965diff --git a/policy/modules/contrib/psad.fc b/policy/modules/contrib/psad.fc
966index 6c66d44..fa18b23 100644
967--- a/policy/modules/contrib/psad.fc
968+++ b/policy/modules/contrib/psad.fc
969@@ -1,4 +1,4 @@
970-/etc/rc\.d/init\.d/psad -- gen_context(system_u:object_r:psad_initrc_exec_t,s0)
971+/etc/init\.d/psad -- gen_context(system_u:object_r:psad_initrc_exec_t,s0)
972 /etc/psad(/.*)? gen_context(system_u:object_r:psad_etc_t,s0)
973
974 /usr/sbin/psad -- gen_context(system_u:object_r:psad_exec_t,s0)
975diff --git a/policy/modules/contrib/puppet.fc b/policy/modules/contrib/puppet.fc
976index 2f1e529..978e99b 100644
977--- a/policy/modules/contrib/puppet.fc
978+++ b/policy/modules/contrib/puppet.fc
979@@ -1,7 +1,7 @@
980 /etc/puppet(/.*)? gen_context(system_u:object_r:puppet_etc_t,s0)
981
982-/etc/rc\.d/init\.d/puppet -- gen_context(system_u:object_r:puppet_initrc_exec_t,s0)
983-/etc/rc\.d/init\.d/puppetmaster -- gen_context(system_u:object_r:puppetmaster_initrc_exec_t,s0)
984+/etc/init\.d/puppet -- gen_context(system_u:object_r:puppet_initrc_exec_t,s0)
985+/etc/init\.d/puppetmaster -- gen_context(system_u:object_r:puppetmaster_initrc_exec_t,s0)
986
987 /usr/sbin/puppetd -- gen_context(system_u:object_r:puppet_exec_t,s0)
988 /usr/sbin/puppetmasterd -- gen_context(system_u:object_r:puppetmaster_exec_t,s0)
989diff --git a/policy/modules/contrib/qpid.fc b/policy/modules/contrib/qpid.fc
990index 4f94229..77389a5 100644
991--- a/policy/modules/contrib/qpid.fc
992+++ b/policy/modules/contrib/qpid.fc
993@@ -1,4 +1,4 @@
994-/etc/rc\.d/init\.d/qpidd -- gen_context(system_u:object_r:qpidd_initrc_exec_t,s0)
995+/etc/init\.d/qpidd -- gen_context(system_u:object_r:qpidd_initrc_exec_t,s0)
996
997 /usr/sbin/qpidd -- gen_context(system_u:object_r:qpidd_exec_t,s0)
998
999diff --git a/policy/modules/contrib/radius.fc b/policy/modules/contrib/radius.fc
1000index 09f7b50..a37d318 100644
1001--- a/policy/modules/contrib/radius.fc
1002+++ b/policy/modules/contrib/radius.fc
1003@@ -1,7 +1,7 @@
1004
1005 /etc/cron\.(daily|monthly)/radiusd -- gen_context(system_u:object_r:radiusd_exec_t,s0)
1006 /etc/cron\.(daily|weekly|monthly)/freeradius -- gen_context(system_u:object_r:radiusd_exec_t,s0)
1007-/etc/rc\.d/init\.d/radiusd -- gen_context(system_u:object_r:radiusd_initrc_exec_t,s0)
1008+/etc/init\.d/radiusd -- gen_context(system_u:object_r:radiusd_initrc_exec_t,s0)
1009
1010 /etc/raddb(/.*)? gen_context(system_u:object_r:radiusd_etc_t,s0)
1011 /etc/raddb/db\.daily -- gen_context(system_u:object_r:radiusd_etc_rw_t,s0)
1012diff --git a/policy/modules/contrib/radvd.fc b/policy/modules/contrib/radvd.fc
1013index cc98d83..245b5e1 100644
1014--- a/policy/modules/contrib/radvd.fc
1015+++ b/policy/modules/contrib/radvd.fc
1016@@ -1,5 +1,5 @@
1017 /etc/radvd\.conf -- gen_context(system_u:object_r:radvd_etc_t,s0)
1018-/etc/rc\.d/init\.d/radvd -- gen_context(system_u:object_r:radvd_initrc_exec_t,s0)
1019+/etc/init\.d/radvd -- gen_context(system_u:object_r:radvd_initrc_exec_t,s0)
1020
1021 /usr/sbin/radvd -- gen_context(system_u:object_r:radvd_exec_t,s0)
1022
1023diff --git a/policy/modules/contrib/rhsmcertd.fc b/policy/modules/contrib/rhsmcertd.fc
1024index c7add8b..53fecf0 100644
1025--- a/policy/modules/contrib/rhsmcertd.fc
1026+++ b/policy/modules/contrib/rhsmcertd.fc
1027@@ -1,4 +1,4 @@
1028-/etc/rc\.d/init\.d/rhsmcertd -- gen_context(system_u:object_r:rhsmcertd_initrc_exec_t,s0)
1029+/etc/init\.d/rhsmcertd -- gen_context(system_u:object_r:rhsmcertd_initrc_exec_t,s0)
1030
1031 /usr/bin/rhsmcertd -- gen_context(system_u:object_r:rhsmcertd_exec_t,s0)
1032
1033diff --git a/policy/modules/contrib/roundup.fc b/policy/modules/contrib/roundup.fc
1034index e4110e6..c0c72f0 100644
1035--- a/policy/modules/contrib/roundup.fc
1036+++ b/policy/modules/contrib/roundup.fc
1037@@ -1,4 +1,4 @@
1038-/etc/rc\.d/init\.d/roundup -- gen_context(system_u:object_r:roundup_initrc_exec_t,s0)
1039+/etc/init\.d/roundup -- gen_context(system_u:object_r:roundup_initrc_exec_t,s0)
1040
1041 #
1042 # /usr
1043diff --git a/policy/modules/contrib/rpc.fc b/policy/modules/contrib/rpc.fc
1044index 4dd92d8..c60eef4 100644
1045--- a/policy/modules/contrib/rpc.fc
1046+++ b/policy/modules/contrib/rpc.fc
1047@@ -2,9 +2,9 @@
1048 # /etc
1049 #
1050 /etc/exports -- gen_context(system_u:object_r:exports_t,s0)
1051-/etc/rc\.d/init\.d/nfs -- gen_context(system_u:object_r:nfsd_initrc_exec_t,s0)
1052-/etc/rc\.d/init\.d/nfslock -- gen_context(system_u:object_r:rpcd_initrc_exec_t,s0)
1053-/etc/rc\.d/init\.d/rpcidmapd -- gen_context(system_u:object_r:rpcd_initrc_exec_t,s0)
1054+/etc/init\.d/nfs -- gen_context(system_u:object_r:nfsd_initrc_exec_t,s0)
1055+/etc/init\.d/nfslock -- gen_context(system_u:object_r:rpcd_initrc_exec_t,s0)
1056+/etc/init\.d/rpcidmapd -- gen_context(system_u:object_r:rpcd_initrc_exec_t,s0)
1057
1058 #
1059 # /sbin
1060diff --git a/policy/modules/contrib/rpcbind.fc b/policy/modules/contrib/rpcbind.fc
1061index 3cd9e62..605f726 100644
1062--- a/policy/modules/contrib/rpcbind.fc
1063+++ b/policy/modules/contrib/rpcbind.fc
1064@@ -1,4 +1,4 @@
1065-/etc/rc\.d/init\.d/rpcbind -- gen_context(system_u:object_r:rpcbind_initrc_exec_t,s0)
1066+/etc/init\.d/rpcbind -- gen_context(system_u:object_r:rpcbind_initrc_exec_t,s0)
1067
1068 /usr/sbin/rpcbind -- gen_context(system_u:object_r:rpcbind_exec_t,s0)
1069
1070diff --git a/policy/modules/contrib/rwho.fc b/policy/modules/contrib/rwho.fc
1071index bc048ce..a2a09ad 100644
1072--- a/policy/modules/contrib/rwho.fc
1073+++ b/policy/modules/contrib/rwho.fc
1074@@ -1,4 +1,4 @@
1075-/etc/rc\.d/init\.d/rwhod -- gen_context(system_u:object_r:rwho_initrc_exec_t,s0)
1076+/etc/init\.d/rwhod -- gen_context(system_u:object_r:rwho_initrc_exec_t,s0)
1077
1078 /usr/sbin/rwhod -- gen_context(system_u:object_r:rwho_exec_t,s0)
1079
1080diff --git a/policy/modules/contrib/samba.fc b/policy/modules/contrib/samba.fc
1081index 69a6074..67cb3c3 100644
1082--- a/policy/modules/contrib/samba.fc
1083+++ b/policy/modules/contrib/samba.fc
1084@@ -2,9 +2,9 @@
1085 #
1086 # /etc
1087 #
1088-/etc/rc\.d/init\.d/nmb -- gen_context(system_u:object_r:samba_initrc_exec_t,s0)
1089-/etc/rc\.d/init\.d/smb -- gen_context(system_u:object_r:samba_initrc_exec_t,s0)
1090-/etc/rc\.d/init\.d/winbind -- gen_context(system_u:object_r:samba_initrc_exec_t,s0)
1091+/etc/init\.d/nmb -- gen_context(system_u:object_r:samba_initrc_exec_t,s0)
1092+/etc/init\.d/smb -- gen_context(system_u:object_r:samba_initrc_exec_t,s0)
1093+/etc/init\.d/winbind -- gen_context(system_u:object_r:samba_initrc_exec_t,s0)
1094 /etc/samba/MACHINE\.SID -- gen_context(system_u:object_r:samba_secrets_t,s0)
1095 /etc/samba/passdb\.tdb -- gen_context(system_u:object_r:samba_secrets_t,s0)
1096 /etc/samba/secrets\.tdb -- gen_context(system_u:object_r:samba_secrets_t,s0)
1097diff --git a/policy/modules/contrib/samhain.fc b/policy/modules/contrib/samhain.fc
1098index 94b2f73..636a07b 100644
1099--- a/policy/modules/contrib/samhain.fc
1100+++ b/policy/modules/contrib/samhain.fc
1101@@ -1,4 +1,4 @@
1102-/etc/rc\.d/init\.d/samhain -- gen_context(system_u:object_r:samhain_initrc_exec_t,s0)
1103+/etc/init\.d/samhain -- gen_context(system_u:object_r:samhain_initrc_exec_t,s0)
1104
1105 /etc/samhainrc -- gen_context(system_u:object_r:samhain_etc_t,mls_systemhigh)
1106
1107diff --git a/policy/modules/contrib/sanlock.fc b/policy/modules/contrib/sanlock.fc
1108index 5d1826c..e5d2044 100644
1109--- a/policy/modules/contrib/sanlock.fc
1110+++ b/policy/modules/contrib/sanlock.fc
1111@@ -1,4 +1,4 @@
1112-/etc/rc\.d/init\.d/sanlock -- gen_context(system_u:object_r:sanlock_initrc_exec_t,s0)
1113+/etc/init\.d/sanlock -- gen_context(system_u:object_r:sanlock_initrc_exec_t,s0)
1114
1115 /var/run/sanlock(/.*)? gen_context(system_u:object_r:sanlock_var_run_t,s0)
1116
1117diff --git a/policy/modules/contrib/sasl.fc b/policy/modules/contrib/sasl.fc
1118index 7e58679..2bfbf1c 100644
1119--- a/policy/modules/contrib/sasl.fc
1120+++ b/policy/modules/contrib/sasl.fc
1121@@ -1,4 +1,4 @@
1122-/etc/rc\.d/init\.d/sasl -- gen_context(system_u:object_r:saslauthd_initrc_exec_t,s0)
1123+/etc/init\.d/sasl -- gen_context(system_u:object_r:saslauthd_initrc_exec_t,s0)
1124
1125 #
1126 # /usr
1127diff --git a/policy/modules/contrib/shorewall.fc b/policy/modules/contrib/shorewall.fc
1128index 48d1363..62b3ab9 100644
1129--- a/policy/modules/contrib/shorewall.fc
1130+++ b/policy/modules/contrib/shorewall.fc
1131@@ -1,5 +1,5 @@
1132-/etc/rc\.d/init\.d/shorewall -- gen_context(system_u:object_r:shorewall_initrc_exec_t,s0)
1133-/etc/rc\.d/init\.d/shorewall-lite -- gen_context(system_u:object_r:shorewall_initrc_exec_t,s0)
1134+/etc/init\.d/shorewall -- gen_context(system_u:object_r:shorewall_initrc_exec_t,s0)
1135+/etc/init\.d/shorewall-lite -- gen_context(system_u:object_r:shorewall_initrc_exec_t,s0)
1136
1137 /etc/shorewall(/.*)? gen_context(system_u:object_r:shorewall_etc_t,s0)
1138 /etc/shorewall-lite(/.*)? gen_context(system_u:object_r:shorewall_etc_t,s0)
1139diff --git a/policy/modules/contrib/smartmon.fc b/policy/modules/contrib/smartmon.fc
1140index 268ae3d..4c83a67 100644
1141--- a/policy/modules/contrib/smartmon.fc
1142+++ b/policy/modules/contrib/smartmon.fc
1143@@ -1,4 +1,4 @@
1144-/etc/rc\.d/init\.d/smartd -- gen_context(system_u:object_r:fsdaemon_initrc_exec_t,s0)
1145+/etc/init\.d/smartd -- gen_context(system_u:object_r:fsdaemon_initrc_exec_t,s0)
1146
1147 #
1148 # /usr
1149diff --git a/policy/modules/contrib/smokeping.fc b/policy/modules/contrib/smokeping.fc
1150index 9ff2d99..2cc9547 100644
1151--- a/policy/modules/contrib/smokeping.fc
1152+++ b/policy/modules/contrib/smokeping.fc
1153@@ -1,4 +1,4 @@
1154-/etc/rc\.d/init\.d/smokeping -- gen_context(system_u:object_r:smokeping_initrc_exec_t,s0)
1155+/etc/init\.d/smokeping -- gen_context(system_u:object_r:smokeping_initrc_exec_t,s0)
1156
1157 /usr/sbin/smokeping -- gen_context(system_u:object_r:smokeping_exec_t,s0)
1158
1159diff --git a/policy/modules/contrib/snmp.fc b/policy/modules/contrib/snmp.fc
1160index 623c8fa..cd82bf8 100644
1161--- a/policy/modules/contrib/snmp.fc
1162+++ b/policy/modules/contrib/snmp.fc
1163@@ -1,5 +1,5 @@
1164-/etc/rc\.d/init\.d/snmpd -- gen_context(system_u:object_r:snmpd_initrc_exec_t,s0)
1165-/etc/rc\.d/init\.d/snmptrapd -- gen_context(system_u:object_r:snmpd_initrc_exec_t,s0)
1166+/etc/init\.d/snmpd -- gen_context(system_u:object_r:snmpd_initrc_exec_t,s0)
1167+/etc/init\.d/snmptrapd -- gen_context(system_u:object_r:snmpd_initrc_exec_t,s0)
1168
1169 #
1170 # /usr
1171diff --git a/policy/modules/contrib/snort.fc b/policy/modules/contrib/snort.fc
1172index 7bedd2f..47c24ae 100644
1173--- a/policy/modules/contrib/snort.fc
1174+++ b/policy/modules/contrib/snort.fc
1175@@ -1,4 +1,4 @@
1176-/etc/rc\.d/init\.d/snortd -- gen_context(system_u:object_r:snort_initrc_exec_t,s0)
1177+/etc/init\.d/snortd -- gen_context(system_u:object_r:snort_initrc_exec_t,s0)
1178 /etc/snort(/.*)? gen_context(system_u:object_r:snort_etc_t,s0)
1179
1180 /usr/s?bin/snort -- gen_context(system_u:object_r:snort_exec_t,s0)
1181diff --git a/policy/modules/contrib/soundserver.fc b/policy/modules/contrib/soundserver.fc
1182index d89b2cb..70c407f 100644
1183--- a/policy/modules/contrib/soundserver.fc
1184+++ b/policy/modules/contrib/soundserver.fc
1185@@ -1,5 +1,5 @@
1186 /etc/nas(/.*)? gen_context(system_u:object_r:soundd_etc_t,s0)
1187-/etc/rc\.d/init\.d/nasd -- gen_context(system_u:object_r:soundd_initrc_exec_t,s0)
1188+/etc/init\.d/nasd -- gen_context(system_u:object_r:soundd_initrc_exec_t,s0)
1189 /etc/yiff(/.*)? gen_context(system_u:object_r:soundd_etc_t,s0)
1190
1191 /usr/bin/nasd -- gen_context(system_u:object_r:soundd_exec_t,s0)
1192diff --git a/policy/modules/contrib/squid.fc b/policy/modules/contrib/squid.fc
1193index 6cc4a90..84afb28 100644
1194--- a/policy/modules/contrib/squid.fc
1195+++ b/policy/modules/contrib/squid.fc
1196@@ -1,4 +1,4 @@
1197-/etc/rc\.d/init\.d/squid -- gen_context(system_u:object_r:squid_initrc_exec_t,s0)
1198+/etc/init\.d/squid -- gen_context(system_u:object_r:squid_initrc_exec_t,s0)
1199 /etc/squid(/.*)? gen_context(system_u:object_r:squid_conf_t,s0)
1200
1201 /usr/lib/squid/cachemgr\.cgi -- gen_context(system_u:object_r:httpd_squid_script_exec_t,s0)
1202diff --git a/policy/modules/contrib/sssd.fc b/policy/modules/contrib/sssd.fc
1203index 4271815..f752f40 100644
1204--- a/policy/modules/contrib/sssd.fc
1205+++ b/policy/modules/contrib/sssd.fc
1206@@ -1,4 +1,4 @@
1207-/etc/rc\.d/init\.d/sssd -- gen_context(system_u:object_r:sssd_initrc_exec_t,s0)
1208+/etc/init\.d/sssd -- gen_context(system_u:object_r:sssd_initrc_exec_t,s0)
1209
1210 /usr/sbin/sssd -- gen_context(system_u:object_r:sssd_exec_t,s0)
1211
1212diff --git a/policy/modules/contrib/tcsd.fc b/policy/modules/contrib/tcsd.fc
1213index 1a6527c..f3f9c69 100644
1214--- a/policy/modules/contrib/tcsd.fc
1215+++ b/policy/modules/contrib/tcsd.fc
1216@@ -1,3 +1,3 @@
1217-/etc/rc\.d/init\.d/tcsd -- gen_context(system_u:object_r:tcsd_initrc_exec_t,s0)
1218+/etc/init\.d/tcsd -- gen_context(system_u:object_r:tcsd_initrc_exec_t,s0)
1219 /usr/sbin/tcsd -- gen_context(system_u:object_r:tcsd_exec_t,s0)
1220 /var/lib/tpm(/.*)? gen_context(system_u:object_r:tcsd_var_lib_t,s0)
1221diff --git a/policy/modules/contrib/tgtd.fc b/policy/modules/contrib/tgtd.fc
1222index 8294f6f..5cdb3b4 100644
1223--- a/policy/modules/contrib/tgtd.fc
1224+++ b/policy/modules/contrib/tgtd.fc
1225@@ -1,3 +1,3 @@
1226-/etc/rc\.d/init\.d/tgtd -- gen_context(system_u:object_r:tgtd_initrc_exec_t,s0)
1227+/etc/init\.d/tgtd -- gen_context(system_u:object_r:tgtd_initrc_exec_t,s0)
1228 /usr/sbin/tgtd -- gen_context(system_u:object_r:tgtd_exec_t,s0)
1229 /var/lib/tgtd(/.*)? gen_context(system_u:object_r:tgtd_var_lib_t,s0)
1230diff --git a/policy/modules/contrib/tor.fc b/policy/modules/contrib/tor.fc
1231index e2e06b2..54a1b70 100644
1232--- a/policy/modules/contrib/tor.fc
1233+++ b/policy/modules/contrib/tor.fc
1234@@ -1,4 +1,4 @@
1235-/etc/rc\.d/init\.d/tor -- gen_context(system_u:object_r:tor_initrc_exec_t,s0)
1236+/etc/init\.d/tor -- gen_context(system_u:object_r:tor_initrc_exec_t,s0)
1237 /etc/tor(/.*)? gen_context(system_u:object_r:tor_etc_t,s0)
1238
1239 /usr/bin/tor -- gen_context(system_u:object_r:tor_exec_t,s0)
1240diff --git a/policy/modules/contrib/tuned.fc b/policy/modules/contrib/tuned.fc
1241index 639c962..36bd64b 100644
1242--- a/policy/modules/contrib/tuned.fc
1243+++ b/policy/modules/contrib/tuned.fc
1244@@ -1,4 +1,4 @@
1245-/etc/rc\.d/init\.d/tuned -- gen_context(system_u:object_r:tuned_initrc_exec_t,s0)
1246+/etc/init\.d/tuned -- gen_context(system_u:object_r:tuned_initrc_exec_t,s0)
1247
1248 /usr/sbin/tuned -- gen_context(system_u:object_r:tuned_exec_t,s0)
1249
1250diff --git a/policy/modules/contrib/ulogd.fc b/policy/modules/contrib/ulogd.fc
1251index 831b4a3..c80abaa 100644
1252--- a/policy/modules/contrib/ulogd.fc
1253+++ b/policy/modules/contrib/ulogd.fc
1254@@ -1,4 +1,4 @@
1255-/etc/rc\.d/init\.d/ulogd -- gen_context(system_u:object_r:ulogd_initrc_exec_t,s0)
1256+/etc/init\.d/ulogd -- gen_context(system_u:object_r:ulogd_initrc_exec_t,s0)
1257 /etc/ulogd.conf -- gen_context(system_u:object_r:ulogd_etc_t,s0)
1258
1259 /usr/lib/ulogd(/.*)? gen_context(system_u:object_r:ulogd_modules_t,s0)
1260diff --git a/policy/modules/contrib/uuidd.fc b/policy/modules/contrib/uuidd.fc
1261index a7c9381..ea1f21a 100644
1262--- a/policy/modules/contrib/uuidd.fc
1263+++ b/policy/modules/contrib/uuidd.fc
1264@@ -1,4 +1,4 @@
1265-/etc/rc\.d/init\.d/uuidd -- gen_context(system_u:object_r:uuidd_initrc_exec_t,s0)
1266+/etc/init\.d/uuidd -- gen_context(system_u:object_r:uuidd_initrc_exec_t,s0)
1267
1268 /usr/sbin/uuidd -- gen_context(system_u:object_r:uuidd_exec_t,s0)
1269
1270diff --git a/policy/modules/contrib/varnishd.fc b/policy/modules/contrib/varnishd.fc
1271index 194d123..1bea69e 100644
1272--- a/policy/modules/contrib/varnishd.fc
1273+++ b/policy/modules/contrib/varnishd.fc
1274@@ -1,6 +1,6 @@
1275-/etc/rc\.d/init\.d/varnish -- gen_context(system_u:object_r:varnishd_initrc_exec_t,s0)
1276-/etc/rc\.d/init\.d/varnishlog -- gen_context(system_u:object_r:varnishlog_initrc_exec_t,s0)
1277-/etc/rc\.d/init\.d/varnishncsa -- gen_context(system_u:object_r:varnishlog_initrc_exec_t,s0)
1278+/etc/init\.d/varnish -- gen_context(system_u:object_r:varnishd_initrc_exec_t,s0)
1279+/etc/init\.d/varnishlog -- gen_context(system_u:object_r:varnishlog_initrc_exec_t,s0)
1280+/etc/init\.d/varnishncsa -- gen_context(system_u:object_r:varnishlog_initrc_exec_t,s0)
1281
1282 /etc/varnish(/.*)? gen_context(system_u:object_r:varnishd_etc_t,s0)
1283
1284diff --git a/policy/modules/contrib/vhostmd.fc b/policy/modules/contrib/vhostmd.fc
1285index c1fb329..a927997 100644
1286--- a/policy/modules/contrib/vhostmd.fc
1287+++ b/policy/modules/contrib/vhostmd.fc
1288@@ -1,4 +1,4 @@
1289-/etc/rc.d/init.d/vhostmd -- gen_context(system_u:object_r:vhostmd_initrc_exec_t,s0)
1290+/etc/init.d/vhostmd -- gen_context(system_u:object_r:vhostmd_initrc_exec_t,s0)
1291
1292 /usr/sbin/vhostmd -- gen_context(system_u:object_r:vhostmd_exec_t,s0)
1293
1294diff --git a/policy/modules/contrib/virt.fc b/policy/modules/contrib/virt.fc
1295index 2124b6a..636ffad 100644
1296--- a/policy/modules/contrib/virt.fc
1297+++ b/policy/modules/contrib/virt.fc
1298@@ -6,7 +6,7 @@ HOME_DIR/VirtualMachines/isos(/.*)? gen_context(system_u:object_r:virt_content_t
1299 /etc/libvirt/[^/]* -- gen_context(system_u:object_r:virt_etc_t,s0)
1300 /etc/libvirt/[^/]* -d gen_context(system_u:object_r:virt_etc_rw_t,s0)
1301 /etc/libvirt/.*/.* gen_context(system_u:object_r:virt_etc_rw_t,s0)
1302-/etc/rc\.d/init\.d/libvirtd -- gen_context(system_u:object_r:virtd_initrc_exec_t,s0)
1303+/etc/init\.d/libvirtd -- gen_context(system_u:object_r:virtd_initrc_exec_t,s0)
1304 /etc/xen -d gen_context(system_u:object_r:virt_etc_t,s0)
1305 /etc/xen/[^/]* -- gen_context(system_u:object_r:virt_etc_t,s0)
1306 /etc/xen/[^/]* -d gen_context(system_u:object_r:virt_etc_rw_t,s0)
1307diff --git a/policy/modules/contrib/zabbix.fc b/policy/modules/contrib/zabbix.fc
1308index aa5a521..88b98da 100644
1309--- a/policy/modules/contrib/zabbix.fc
1310+++ b/policy/modules/contrib/zabbix.fc
1311@@ -1,5 +1,5 @@
1312-/etc/rc\.d/init\.d/zabbix -- gen_context(system_u:object_r:zabbix_initrc_exec_t,s0)
1313-/etc/rc\.d/init\.d/zabbix-agentd -- gen_context(system_u:object_r:zabbix_agent_initrc_exec_t,s0)
1314+/etc/init\.d/zabbix -- gen_context(system_u:object_r:zabbix_initrc_exec_t,s0)
1315+/etc/init\.d/zabbix-agentd -- gen_context(system_u:object_r:zabbix_agent_initrc_exec_t,s0)
1316
1317 /usr/(s)?bin/zabbix_server -- gen_context(system_u:object_r:zabbix_exec_t,s0)
1318 /usr/(s)?bin/zabbix_agentd -- gen_context(system_u:object_r:zabbix_agent_exec_t,s0)
1319diff --git a/policy/modules/contrib/zebra.fc b/policy/modules/contrib/zebra.fc
1320index e1b30b2..10c1164 100644
1321--- a/policy/modules/contrib/zebra.fc
1322+++ b/policy/modules/contrib/zebra.fc
1323@@ -1,9 +1,9 @@
1324-/etc/rc\.d/init\.d/bgpd -- gen_context(system_u:object_r:zebra_initrc_exec_t,s0)
1325-/etc/rc\.d/init\.d/ospf6d -- gen_context(system_u:object_r:zebra_initrc_exec_t,s0)
1326-/etc/rc\.d/init\.d/ospfd -- gen_context(system_u:object_r:zebra_initrc_exec_t,s0)
1327-/etc/rc\.d/init\.d/ripd -- gen_context(system_u:object_r:zebra_initrc_exec_t,s0)
1328-/etc/rc\.d/init\.d/ripngd -- gen_context(system_u:object_r:zebra_initrc_exec_t,s0)
1329-/etc/rc\.d/init\.d/zebra -- gen_context(system_u:object_r:zebra_initrc_exec_t,s0)
1330+/etc/init\.d/bgpd -- gen_context(system_u:object_r:zebra_initrc_exec_t,s0)
1331+/etc/init\.d/ospf6d -- gen_context(system_u:object_r:zebra_initrc_exec_t,s0)
1332+/etc/init\.d/ospfd -- gen_context(system_u:object_r:zebra_initrc_exec_t,s0)
1333+/etc/init\.d/ripd -- gen_context(system_u:object_r:zebra_initrc_exec_t,s0)
1334+/etc/init\.d/ripngd -- gen_context(system_u:object_r:zebra_initrc_exec_t,s0)
1335+/etc/init\.d/zebra -- gen_context(system_u:object_r:zebra_initrc_exec_t,s0)
1336
1337 /usr/sbin/bgpd -- gen_context(system_u:object_r:zebra_exec_t,s0)
1338 /usr/sbin/zebra -- gen_context(system_u:object_r:zebra_exec_t,s0)
1339diff --git a/policy/modules/kernel/corecommands.fc b/policy/modules/kernel/corecommands.fc
1340index 9eb091a..66b4ecb 100644
1341--- a/policy/modules/kernel/corecommands.fc
1342+++ b/policy/modules/kernel/corecommands.fc
1343@@ -96,8 +96,6 @@ ifdef(`distro_redhat',`
1344
1345 /etc/racoon/scripts(/.*)? gen_context(system_u:object_r:bin_t,s0)
1346
1347-/etc/rc\.d/init\.d/functions -- gen_context(system_u:object_r:bin_t,s0)
1348-
1349 /etc/security/namespace.init -- gen_context(system_u:object_r:bin_t,s0)
1350
1351 /etc/sysconfig/crond -- gen_context(system_u:object_r:bin_t,s0)
1352diff --git a/policy/modules/services/postgresql.fc b/policy/modules/services/postgresql.fc
1353index f03fad4..c342bf3 100644
1354--- a/policy/modules/services/postgresql.fc
1355+++ b/policy/modules/services/postgresql.fc
1356@@ -2,7 +2,7 @@
1357 # /etc
1358 #
1359 /etc/postgresql(/.*)? gen_context(system_u:object_r:postgresql_etc_t,s0)
1360-/etc/rc\.d/init\.d/(se)?postgresql -- gen_context(system_u:object_r:postgresql_initrc_exec_t,s0)
1361+/etc/init\.d/(se)?postgresql -- gen_context(system_u:object_r:postgresql_initrc_exec_t,s0)
1362 /etc/sysconfig/pgsql(/.*)? gen_context(system_u:object_r:postgresql_etc_t,s0)
1363
1364 #
1365diff --git a/policy/modules/system/init.fc b/policy/modules/system/init.fc
1366index d4d7489..ca55704 100644
1367--- a/policy/modules/system/init.fc
1368+++ b/policy/modules/system/init.fc
1369@@ -3,10 +3,9 @@
1370 #
1371 /etc/init\.d/.* -- gen_context(system_u:object_r:initrc_exec_t,s0)
1372
1373-/etc/rc\.d/rc -- gen_context(system_u:object_r:initrc_exec_t,s0)
1374-/etc/rc\.d/rc\.[^/]+ -- gen_context(system_u:object_r:initrc_exec_t,s0)
1375+/etc/init\.d/rc -- gen_context(system_u:object_r:initrc_exec_t,s0)
1376+/etc/rc\.[^/]+ -- gen_context(system_u:object_r:initrc_exec_t,s0)
1377
1378-/etc/rc\.d/init\.d/.* -- gen_context(system_u:object_r:initrc_exec_t,s0)
1379 /etc/sysconfig/network-scripts/ifup-ipsec -- gen_context(system_u:object_r:initrc_exec_t,s0)
1380
1381 /etc/X11/prefdm -- gen_context(system_u:object_r:initrc_exec_t,s0)
1382diff --git a/policy/modules/system/init.te b/policy/modules/system/init.te
1383index b7fcbe3..1e6e6a8 100644
1384--- a/policy/modules/system/init.te
1385+++ b/policy/modules/system/init.te
1386@@ -534,7 +534,7 @@ ifdef(`distro_redhat',`
1387 ')
1388
1389 optional_policy(`
1390- #for /etc/rc.d/init.d/nfs to create /etc/exports
1391+ #for /etc/init.d/nfs to create /etc/exports
1392 rpc_write_exports(initrc_t)
1393 rpc_manage_nfs_state_data(initrc_t)
1394 ')
1395@@ -691,7 +691,7 @@ optional_policy(`
1396 # This is needed to permit chown to read /var/spool/lpd/lp.
1397 # This is opens up security more than necessary; this means that ANYTHING
1398 # running in the initrc_t domain can read the printer spool directory.
1399- # Perhaps executing /etc/rc.d/init.d/lpd should transition
1400+ # Perhaps executing /etc/init.d/lpd should transition
1401 # to domain lpd_t, instead of waiting for executing lpd.
1402 lpd_list_spool(initrc_t)
1403
1404diff --git a/policy/modules/system/ipsec.fc b/policy/modules/system/ipsec.fc
1405index fb09b9e..2a15800 100644
1406--- a/policy/modules/system/ipsec.fc
1407+++ b/policy/modules/system/ipsec.fc
1408@@ -1,5 +1,5 @@
1409-/etc/rc\.d/init\.d/ipsec -- gen_context(system_u:object_r:ipsec_initrc_exec_t,s0)
1410-/etc/rc\.d/init\.d/racoon -- gen_context(system_u:object_r:ipsec_initrc_exec_t,s0)
1411+/etc/init\.d/ipsec -- gen_context(system_u:object_r:ipsec_initrc_exec_t,s0)
1412+/etc/init\.d/racoon -- gen_context(system_u:object_r:ipsec_initrc_exec_t,s0)
1413
1414 /etc/ipsec\.secrets -- gen_context(system_u:object_r:ipsec_key_file_t,s0)
1415 /etc/ipsec\.conf -- gen_context(system_u:object_r:ipsec_conf_file_t,s0)
1416diff --git a/policy/modules/system/iptables.fc b/policy/modules/system/iptables.fc
1417index 14cffd2..c63e4f9 100644
1418--- a/policy/modules/system/iptables.fc
1419+++ b/policy/modules/system/iptables.fc
1420@@ -1,5 +1,5 @@
1421-/etc/rc\.d/init\.d/ip6?tables -- gen_context(system_u:object_r:iptables_initrc_exec_t,s0)
1422-/etc/rc\.d/init\.d/ebtables -- gen_context(system_u:object_r:iptables_initrc_exec_t,s0)
1423+/etc/init\.d/ip6?tables -- gen_context(system_u:object_r:iptables_initrc_exec_t,s0)
1424+/etc/init\.d/ebtables -- gen_context(system_u:object_r:iptables_initrc_exec_t,s0)
1425 /etc/sysconfig/ip6?tables.* -- gen_context(system_u:object_r:iptables_conf_t,s0)
1426 /etc/sysconfig/system-config-firewall.* -- gen_context(system_u:object_r:iptables_conf_t,s0)
1427
1428diff --git a/policy/modules/system/logging.fc b/policy/modules/system/logging.fc
1429index 02f4c97..4fe395e 100644
1430--- a/policy/modules/system/logging.fc
1431+++ b/policy/modules/system/logging.fc
1432@@ -3,8 +3,8 @@
1433 /etc/rsyslog.conf gen_context(system_u:object_r:syslog_conf_t,s0)
1434 /etc/syslog.conf gen_context(system_u:object_r:syslog_conf_t,s0)
1435 /etc/audit(/.*)? gen_context(system_u:object_r:auditd_etc_t,mls_systemhigh)
1436-/etc/rc\.d/init\.d/auditd -- gen_context(system_u:object_r:auditd_initrc_exec_t,s0)
1437-/etc/rc\.d/init\.d/rsyslog -- gen_context(system_u:object_r:syslogd_initrc_exec_t,s0)
1438+/etc/init\.d/auditd -- gen_context(system_u:object_r:auditd_initrc_exec_t,s0)
1439+/etc/init\.d/rsyslog -- gen_context(system_u:object_r:syslogd_initrc_exec_t,s0)
1440
1441 /sbin/audispd -- gen_context(system_u:object_r:audisp_exec_t,s0)
1442 /sbin/audisp-remote -- gen_context(system_u:object_r:audisp_remote_exec_t,s0)
1443diff --git a/policy/modules/system/setrans.fc b/policy/modules/system/setrans.fc
1444index bea4629..95774bd 100644
1445--- a/policy/modules/system/setrans.fc
1446+++ b/policy/modules/system/setrans.fc
1447@@ -1,4 +1,4 @@
1448-/etc/rc\.d/init\.d/mcstrans -- gen_context(system_u:object_r:setrans_initrc_exec_t,s0)
1449+/etc/init\.d/mcstrans -- gen_context(system_u:object_r:setrans_initrc_exec_t,s0)
1450
1451 /sbin/mcstransd -- gen_context(system_u:object_r:setrans_exec_t,s0)
1452
1453--
14541.7.5.4
1455
diff --git a/recipes-security/refpolicy/refpolicy-2.20120215/poky-fc-update-alternatives_sysvinit.patch b/recipes-security/refpolicy/refpolicy-2.20120725/poky-fc-update-alternatives_sysvinit.patch
index 01905ea..9e0a71f 100644
--- a/recipes-security/refpolicy/refpolicy-2.20120215/poky-fc-update-alternatives_sysvinit.patch
+++ b/recipes-security/refpolicy/refpolicy-2.20120725/poky-fc-update-alternatives_sysvinit.patch
@@ -1,8 +1,6 @@
1From 11230c7bad442d70484880f59929a6d5cdc8a2e6 Mon Sep 17 00:00:00 2001 1Subject: [PATCH] fix update-alternatives for sysvinit
2From: Xin Ouyang <Xin.Ouyang@windriver.com>
3Date: Mon, 2 Jul 2012 14:53:21 +0800
4Subject: [PATCH] refpolicy: sysvinit fix.
5 2
3Upstream-Status: Inappropriate [only for Poky]
6--- 4---
7 policy/modules/contrib/shutdown.fc | 1 + 5 policy/modules/contrib/shutdown.fc | 1 +
8 policy/modules/kernel/corecommands.fc | 1 + 6 policy/modules/kernel/corecommands.fc | 1 +
@@ -21,7 +19,7 @@ index 97671a3..6cad0fd 100644
21 19
22 /var/run/shutdown\.pid -- gen_context(system_u:object_r:shutdown_var_run_t,s0) 20 /var/run/shutdown\.pid -- gen_context(system_u:object_r:shutdown_var_run_t,s0)
23diff --git a/policy/modules/kernel/corecommands.fc b/policy/modules/kernel/corecommands.fc 21diff --git a/policy/modules/kernel/corecommands.fc b/policy/modules/kernel/corecommands.fc
24index 6590490..9eb091a 100644 22index db981df..f051c4a 100644
25--- a/policy/modules/kernel/corecommands.fc 23--- a/policy/modules/kernel/corecommands.fc
26+++ b/policy/modules/kernel/corecommands.fc 24+++ b/policy/modules/kernel/corecommands.fc
27@@ -10,6 +10,7 @@ 25@@ -10,6 +10,7 @@
@@ -33,10 +31,10 @@ index 6590490..9eb091a 100644
33 /bin/tcsh -- gen_context(system_u:object_r:shell_exec_t,s0) 31 /bin/tcsh -- gen_context(system_u:object_r:shell_exec_t,s0)
34 /bin/yash -- gen_context(system_u:object_r:shell_exec_t,s0) 32 /bin/yash -- gen_context(system_u:object_r:shell_exec_t,s0)
35diff --git a/policy/modules/system/init.fc b/policy/modules/system/init.fc 33diff --git a/policy/modules/system/init.fc b/policy/modules/system/init.fc
36index d94bcc3..d4d7489 100644 34index d2e40b8..80150ef 100644
37--- a/policy/modules/system/init.fc 35--- a/policy/modules/system/init.fc
38+++ b/policy/modules/system/init.fc 36+++ b/policy/modules/system/init.fc
39@@ -34,6 +34,7 @@ ifdef(`distro_gentoo', ` 37@@ -32,6 +32,7 @@ ifdef(`distro_gentoo', `
40 # /sbin 38 # /sbin
41 # 39 #
42 /sbin/init(ng)? -- gen_context(system_u:object_r:init_exec_t,s0) 40 /sbin/init(ng)? -- gen_context(system_u:object_r:init_exec_t,s0)
diff --git a/recipes-security/refpolicy/refpolicy-mls_2.20120215.bb b/recipes-security/refpolicy/refpolicy-mls_2.20120725.bb
index 61577a9..61577a9 100644
--- a/recipes-security/refpolicy/refpolicy-mls_2.20120215.bb
+++ b/recipes-security/refpolicy/refpolicy-mls_2.20120725.bb
diff --git a/recipes-security/refpolicy/refpolicy-standard_2.20120215.bb b/recipes-security/refpolicy/refpolicy-standard_2.20120725.bb
index b64a461..b64a461 100644
--- a/recipes-security/refpolicy/refpolicy-standard_2.20120215.bb
+++ b/recipes-security/refpolicy/refpolicy-standard_2.20120725.bb
diff --git a/recipes-security/refpolicy/refpolicy_2.20120215.inc b/recipes-security/refpolicy/refpolicy_2.20120215.inc
deleted file mode 100644
index 0069f44..0000000
--- a/recipes-security/refpolicy/refpolicy_2.20120215.inc
+++ /dev/null
@@ -1,11 +0,0 @@
1SRC_URI = "http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2;"
2SRC_URI[md5sum] = "618a24cfed3b3ee09084fb2c179de92e"
3SRC_URI[sha256sum] = "6df77faf62f73bd1f6e3bfca3fa2f77cdfd2cada94a7dcc4816ed9bbcf3545dc"
4
5FILESEXTRAPATHS_prepend := "${THISDIR}/refpolicy-2.20120215:"
6SRC_URI += "file://poky-fc-update-alternatives_sysvinit.patch \
7 file://poky-fc-etc_init.d.patch \
8 file://fix-mount-to-write-mountpoints-dirs.patch \
9 "
10
11include refpolicy_common.inc
diff --git a/recipes-security/refpolicy/refpolicy_2.20120725.inc b/recipes-security/refpolicy/refpolicy_2.20120725.inc
new file mode 100644
index 0000000..06ea436
--- /dev/null
+++ b/recipes-security/refpolicy/refpolicy_2.20120725.inc
@@ -0,0 +1,9 @@
1SRC_URI = "http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2;"
2SRC_URI[md5sum] = "8aaa8a23cc1b7b7045f6f134e879ddb7"
3SRC_URI[sha256sum] = "7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635"
4
5FILESEXTRAPATHS_prepend := "${THISDIR}/refpolicy-${PV}:"
6SRC_URI += "file://poky-fc-update-alternatives_sysvinit.patch \
7 "
8
9include refpolicy_common.inc