From: Dan Walsh <dwalsh@redhat.com>
Date: Tue, 6 Dec 2011 21:59:50 +0000 (-0500)
Subject: Finish /bin->/usr/bin merge
X-Git-Tag: 000~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=689f200a32c662cef71a809bb1143cb72892c93a;p=people%2Fstevee%2Fselinux-policy.git

Finish /bin->/usr/bin merge
---

diff --git a/policy/modules/admin/bootloader.fc b/policy/modules/admin/bootloader.fc
index 39f1adfc..3cf6457c 100644
--- 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 32b31b48..47380833 100644
--- 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)