summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2014-01-27 04:33:56 -0500
committerXin Ouyang <xin.ouyang@windriver.com>2014-01-28 15:20:19 +0800
commit271955d346f305b196f069d9dc46db16c43678de (patch)
treecdba9806a6f428196c90d1f2bfacf156be4f5c09
parentfeda8d99e68636eacdcea1c8f938cd0339700fc2 (diff)
downloadmeta-selinux-271955d346f305b196f069d9dc46db16c43678de.tar.gz
refpolicy: fix real path for swapoff
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
-rw-r--r--recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-fstools.patch19
1 files changed, 10 insertions, 9 deletions
diff --git a/recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-fstools.patch b/recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-fstools.patch
index 8e54921..5343893 100644
--- a/recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-fstools.patch
+++ b/recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-fstools.patch
@@ -1,17 +1,17 @@
1From 852860529f24547b662d9383c0eaa821c9efa406 Mon Sep 17 00:00:00 2001 1From 7fdfd2ef8764ddfaeb43e53a756af83d42d8ac8b Mon Sep 17 00:00:00 2001
2From: Xin Ouyang <Xin.Ouyang@windriver.com> 2From: Wenzong Fan <wenzong.fan@windriver.com>
3Date: Thu, 22 Aug 2013 19:18:39 +0800 3Date: Mon, 27 Jan 2014 03:54:01 -0500
4Subject: [PATCH] efpolicy: fix real path for fstools 4Subject: [PATCH] refpolicy: fix real path for fstools
5 5
6Upstream-Status: Inappropriate [configuration] 6Upstream-Status: Inappropriate [configuration]
7 7
8Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com> 8Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
9--- 9---
10 policy/modules/system/fstools.fc | 11 +++++++++++ 10 policy/modules/system/fstools.fc | 12 ++++++++++++
11 1 file changed, 11 insertions(+) 11 1 file changed, 12 insertions(+)
12 12
13diff --git a/policy/modules/system/fstools.fc b/policy/modules/system/fstools.fc 13diff --git a/policy/modules/system/fstools.fc b/policy/modules/system/fstools.fc
14index 7a46b45..9656352 100644 14index 7a46b45..a724776 100644
15--- a/policy/modules/system/fstools.fc 15--- a/policy/modules/system/fstools.fc
16+++ b/policy/modules/system/fstools.fc 16+++ b/policy/modules/system/fstools.fc
17@@ -1,6 +1,8 @@ 17@@ -1,6 +1,8 @@
@@ -36,7 +36,7 @@ index 7a46b45..9656352 100644
36 /sbin/install-mbr -- gen_context(system_u:object_r:fsadm_exec_t,s0) 36 /sbin/install-mbr -- gen_context(system_u:object_r:fsadm_exec_t,s0)
37 /sbin/jfs_.* -- gen_context(system_u:object_r:fsadm_exec_t,s0) 37 /sbin/jfs_.* -- gen_context(system_u:object_r:fsadm_exec_t,s0)
38 /sbin/losetup.* -- gen_context(system_u:object_r:fsadm_exec_t,s0) 38 /sbin/losetup.* -- gen_context(system_u:object_r:fsadm_exec_t,s0)
39@@ -24,21 +29,27 @@ 39@@ -24,21 +29,28 @@
40 /sbin/mkraid -- gen_context(system_u:object_r:fsadm_exec_t,s0) 40 /sbin/mkraid -- gen_context(system_u:object_r:fsadm_exec_t,s0)
41 /sbin/mkreiserfs -- gen_context(system_u:object_r:fsadm_exec_t,s0) 41 /sbin/mkreiserfs -- gen_context(system_u:object_r:fsadm_exec_t,s0)
42 /sbin/mkswap -- gen_context(system_u:object_r:fsadm_exec_t,s0) 42 /sbin/mkswap -- gen_context(system_u:object_r:fsadm_exec_t,s0)
@@ -55,6 +55,7 @@ index 7a46b45..9656352 100644
55 /sbin/sfdisk -- gen_context(system_u:object_r:fsadm_exec_t,s0) 55 /sbin/sfdisk -- gen_context(system_u:object_r:fsadm_exec_t,s0)
56+/usr/sbin/sfdisk -- gen_context(system_u:object_r:fsadm_exec_t,s0) 56+/usr/sbin/sfdisk -- gen_context(system_u:object_r:fsadm_exec_t,s0)
57 /sbin/swapoff -- gen_context(system_u:object_r:fsadm_exec_t,s0) 57 /sbin/swapoff -- gen_context(system_u:object_r:fsadm_exec_t,s0)
58+/sbin/swapoff\.util-linux -- gen_context(system_u:object_r:fsadm_exec_t,s0)
58 /sbin/swapon.* -- gen_context(system_u:object_r:fsadm_exec_t,s0) 59 /sbin/swapon.* -- gen_context(system_u:object_r:fsadm_exec_t,s0)
59 /sbin/tune2fs -- gen_context(system_u:object_r:fsadm_exec_t,s0) 60 /sbin/tune2fs -- gen_context(system_u:object_r:fsadm_exec_t,s0)
60 61