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 226B5138CDC for ; Wed, 27 May 2015 20:00:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 452BAE0872; Wed, 27 May 2015 20:00:46 +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 8B87DE0870 for ; Wed, 27 May 2015 20:00:45 +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 D05E2340E7A for ; Wed, 27 May 2015 20:00:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 807C8A0D for ; Wed, 27 May 2015 20:00:43 +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: <1432753191.78438b16c855c83be05b9d421c8fd0a3d0e878d2.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.if policy/modules/system/selinuxutil.if X-VCS-Directories: policy/modules/system/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 78438b16c855c83be05b9d421c8fd0a3d0e878d2 X-VCS-Branch: master Date: Wed, 27 May 2015 20:00:43 +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: 9a922d73-153f-45e4-8c22-ad7dafe6e71d X-Archives-Hash: 6ebd252b3a4382188ca9631b3be5d808 commit: 78438b16c855c83be05b9d421c8fd0a3d0e878d2 Author: Jason Zaman perfinion com> AuthorDate: Wed May 27 18:58:19 2015 +0000 Commit: Jason Zaman gentoo org> CommitDate: Wed May 27 18:59:51 2015 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=78438b16 Add openrc support to init_startstop_service Adds the openrc rules in ifdef distro_gentoo to transition to run_init correctly. policy/modules/system/init.if | 3 ++- policy/modules/system/selinuxutil.if | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/policy/modules/system/init.if b/policy/modules/system/init.if index 7b17c5c..ed65609 100644 --- a/policy/modules/system/init.if +++ b/policy/modules/system/init.if @@ -999,7 +999,8 @@ interface(`init_startstop_service',` ifndef(`direct_sysadm_daemon',` ifdef(`distro_gentoo',` - seutil_spec_run_runinit($1, $2, $4) + # for OpenRC + seutil_labeled_init_script_run_runinit($1, $2, $4) ',` # rules for sysvinit / upstart init_labeled_script_domtrans($1, $4) diff --git a/policy/modules/system/selinuxutil.if b/policy/modules/system/selinuxutil.if index e69f279..bcb4330 100644 --- a/policy/modules/system/selinuxutil.if +++ b/policy/modules/system/selinuxutil.if @@ -398,7 +398,7 @@ interface(`seutil_domtrans_runinit',` ## ## # -interface(`seutil_spec_domtrans_runinit',` +interface(`seutil_labeled_init_script_domtrans_runinit',` gen_require(` type run_init_t; ') @@ -534,12 +534,12 @@ interface(`seutil_init_script_run_runinit',` ## ## # -interface(`seutil_spec_run_runinit',` +interface(`seutil_labeled_init_script_run_runinit',` gen_require(` attribute_role run_init_roles; ') - seutil_spec_domtrans_runinit($1, $3) + seutil_labeled_init_script_domtrans_runinit($1, $3) roleattribute $2 run_init_roles; ')