From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F20671396D1 for ; Sat, 9 Sep 2017 03:02:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10FB21FC0AD; Sat, 9 Sep 2017 03:02:18 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E249C1FC0AD for ; Sat, 9 Sep 2017 03:02:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D377E341781 for ; Sat, 9 Sep 2017 03:02:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5858C9076 for ; Sat, 9 Sep 2017 03:02:15 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1504925819.309123918ff4990a52478e20c0679d9382de7267.perfinion@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: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 309123918ff4990a52478e20c0679d9382de7267 X-VCS-Branch: master Date: Sat, 9 Sep 2017 03:02:15 +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: 49a3679f-0715-4e21-a984-e76b98379da7 X-Archives-Hash: 96f63f1277d3037bc29745ce19c75dc0 commit: 309123918ff4990a52478e20c0679d9382de7267 Author: Chris PeBenito ieee org> AuthorDate: Fri Sep 8 23:30:34 2017 +0000 Commit: Jason Zaman gentoo org> CommitDate: Sat Sep 9 02:56:59 2017 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=30912391 init: Move fc lines. policy/modules/system/init.fc | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/policy/modules/system/init.fc b/policy/modules/system/init.fc index 8a8ce871..1637792a 100644 --- a/policy/modules/system/init.fc +++ b/policy/modules/system/init.fc @@ -34,14 +34,6 @@ ifdef(`distro_gentoo',` /usr/lib/systemd/ntp-units\.d -d gen_context(system_u:object_r:systemd_unit_t,s0) /usr/lib/systemd/system(/.*)? gen_context(system_u:object_r:systemd_unit_t,s0) -ifdef(`distro_gentoo', ` -/usr/lib/rc/init\.d(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) -') - -ifdef(`distro_redhat',` -/usr/lib/systemd/rhel[^/]* -- gen_context(system_u:object_r:initrc_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) @@ -50,9 +42,14 @@ ifdef(`distro_redhat',` /usr/sbin/upstart -- gen_context(system_u:object_r:init_exec_t,s0) ifdef(`distro_gentoo', ` +/usr/lib/rc/init\.d(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) /usr/sbin/rc -- gen_context(system_u:object_r:rc_exec_t,s0) ') +ifdef(`distro_redhat',` +/usr/lib/systemd/rhel[^/]* -- gen_context(system_u:object_r:initrc_exec_t,s0) +') + # # /var #