Finish /bin->/usr/bin merge

diff --git a/policy/modules/admin/bootloader.fc b/policy/modules/admin/bootloader.fc
index 39f1adfc310e70b46c001afb2fd1bd989b8aa8d3..3cf6457cbc36444529c2a05c559654721e5001b1 100644 (file)
--- a/policy/modules/admin/bootloader.fc
+++ b/policy/modules/admin/bootloader.fc
@@ -7,5 +7,5 @@
 /sbin/ybin.*           --      gen_context(system_u:object_r:bootloader_exec_t,s0)
 
 /usr/sbin/grub.*       --      gen_context(system_u:object_r:bootloader_exec_t,s0)
-/sur/sbin/lilo.*       --      gen_context(system_u:object_r:bootloader_exec_t,s0)
+/usr/sbin/lilo.*       --      gen_context(system_u:object_r:bootloader_exec_t,s0)
 /usr/sbin/ybin.*       --      gen_context(system_u:object_r:bootloader_exec_t,s0)

diff --git a/policy/modules/system/init.fc b/policy/modules/system/init.fc
index 32b31b4876d0caa4b5139138f7f61868245ed29a..473808336a79faab1105ff54479da53e42639c83 100644 (file)
--- a/policy/modules/system/init.fc
+++ b/policy/modules/system/init.fc
@@ -48,8 +48,6 @@ ifdef(`distro_gentoo', `
 /sbin/init(ng)?                --      gen_context(system_u:object_r:init_exec_t,s0)
 # because nowadays, /sbin/init is often a symlink to /sbin/upstart
 /sbin/upstart          --      gen_context(system_u:object_r:init_exec_t,s0)
-# for Fedora
-/lib/upstart/init   --  gen_context(system_u:object_r:init_exec_t,s0)
 
 ifdef(`distro_gentoo', `
 /sbin/rc               --      gen_context(system_u:object_r:initrc_exec_t,s0)