From 96b9246e1f6207cb231ebfa334101e0cec33b6bf Mon Sep 17 00:00:00 2001 From: sbrissen Date: Thu, 12 Nov 2015 08:05:26 -0500 Subject: kona-common: fix mismerge/build issue Change-Id: I28e6e0b6dac128d03bde95b3bba4fb94e337cb40 --- selinux/init.te | 2 +- selinux/system_app.te | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'selinux') diff --git a/selinux/init.te b/selinux/init.te index aac9a68..d231f03 100644 --- a/selinux/init.te +++ b/selinux/init.te @@ -4,4 +4,4 @@ allow init init:tcp_socket { read write create }; allow init port:tcp_socket name_connect; allow init self:tcp_socket { read write getopt connect }; allow init kernel:system syslog_read; -allow init system_file:file execute_no_trans; +#allow init system_file:file execute_no_trans; diff --git a/selinux/system_app.te b/selinux/system_app.te index ef29468..2e162b8 100644 --- a/selinux/system_app.te +++ b/selinux/system_app.te @@ -1,6 +1,2 @@ allow system_app log_device:chr_file write; -<<<<<<< HEAD -allow system_app sysfs:file write; -======= # allow system_app sysfs:file write; ->>>>>>> c4949ef... kona-common : update selinux 2 -- cgit v1.1