From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0978813838B for ; Sat, 13 Sep 2014 09:38:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A764AE0867; Sat, 13 Sep 2014 09:38:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8B15AE0872 for ; Sat, 13 Sep 2014 09:38:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6F00A340241 for ; Sat, 13 Sep 2014 09:38:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D651A559D for ; Sat, 13 Sep 2014 09:38:35 +0000 (UTC) From: "Sven Vermeulen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" Message-ID: <1410600825.b345de50c6447626549e0865831175f1f2ec85de.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/system/init.fc X-VCS-Directories: policy/modules/system/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: b345de50c6447626549e0865831175f1f2ec85de X-VCS-Branch: master Date: Sat, 13 Sep 2014 09:38:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 77f2bea9-7d18-491d-9e1c-fb4255da4e8f X-Archives-Hash: b357fa28a04d0692117d82e05b91a189 commit: b345de50c6447626549e0865831175f1f2ec85de Author: Sven Vermeulen siphos be> AuthorDate: Sat Sep 13 09:33:45 2014 +0000 Commit: Sven Vermeulen gentoo org> CommitDate: Sat Sep 13 09:33:45 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=b345de50 Move gentoo specifics downward for faster merging --- policy/modules/system/init.fc | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/policy/modules/system/init.fc b/policy/modules/system/init.fc index e499287..b4391ce 100644 --- a/policy/modules/system/init.fc +++ b/policy/modules/system/init.fc @@ -26,7 +26,6 @@ ifdef(`distro_gentoo',` ifdef(`distro_gentoo', ` /lib/rc/init\.d(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) -/lib/rc/console(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) ') # @@ -38,7 +37,6 @@ ifdef(`distro_gentoo', ` ifdef(`distro_gentoo', ` /sbin/rc -- gen_context(system_u:object_r:rc_exec_t,s0) -/sbin/openrc -- gen_context(system_u:object_r:rc_exec_t,s0) ') # @@ -46,7 +44,7 @@ ifdef(`distro_gentoo', ` # /usr/bin/sepg_ctl -- gen_context(system_u:object_r:initrc_exec_t,s0) -/usr/lib/systemd/systemd -- gen_context(system_u:object_r:init_exec_t,s0) +/usr/lib/systemd/systemd -- gen_context(system_u:object_r:init_exec_t,s0) /usr/libexec/dcc/start-.* -- gen_context(system_u:object_r:initrc_exec_t,s0) /usr/libexec/dcc/stop-.* -- gen_context(system_u:object_r:initrc_exec_t,s0) @@ -73,9 +71,7 @@ ifdef(`distro_debian',` ifdef(`distro_gentoo', ` /var/lib/init\.d(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) -/var/lib/ip6?tables(/.*)? gen_context(system_u:object_r:initrc_tmp_t,s0) /var/run/svscan\.pid -- gen_context(system_u:object_r:initrc_var_run_t,s0) -/var/run/openrc(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) ') ifdef(`distro_suse', ` @@ -85,3 +81,22 @@ ifdef(`distro_suse', ` /var/run/setleds-on -- gen_context(system_u:object_r:initrc_var_run_t,s0) /var/run/sysconfig(/.*)? gen_context(system_u:object_r:initrc_var_run_t,s0) ') + +ifdef(`distro_gentoo',` +# +# /lib +# +/lib/rc/console(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) + +# +# /sbin +# +/sbin/openrc -- gen_context(system_u:object_r:rc_exec_t,s0) + +# +# /var +# +/var/lib/ip6?tables(/.*)? gen_context(system_u:object_r:initrc_tmp_t,s0) + +/var/run/openrc(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) +')