From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-810281-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 427A4138CD3 for <garchives@archives.gentoo.org>; Tue, 9 Jun 2015 13:24:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DA63EE089A; Tue, 9 Jun 2015 13:24:26 +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 8D464E089C for <gentoo-commits@lists.gentoo.org>; Tue, 9 Jun 2015 13:24:21 +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 8102B340AC5 for <gentoo-commits@lists.gentoo.org>; Tue, 9 Jun 2015 13:24:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3C81FA3E for <gentoo-commits@lists.gentoo.org>; Tue, 9 Jun 2015 13:24:18 +0000 (UTC) From: "Sven Vermeulen" <swift@gentoo.org> 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" <swift@gentoo.org> Message-ID: <1432753191.78438b16c855c83be05b9d421c8fd0a3d0e878d2.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:swift 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: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: 78438b16c855c83be05b9d421c8fd0a3d0e878d2 X-VCS-Branch: swift Date: Tue, 9 Jun 2015 13:24:18 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ae8ed383-203c-44f2-af2f-bf59fdee3eb8 X-Archives-Hash: 664b6a32f4de01fef779cdefd3ea9f8c commit: 78438b16c855c83be05b9d421c8fd0a3d0e878d2 Author: Jason Zaman <jason <AT> perfinion <DOT> com> AuthorDate: Wed May 27 18:58:19 2015 +0000 Commit: Sven Vermeulen <swift <AT> gentoo <DOT> 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',` ## </summary> ## </param> # -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',` ## </summary> ## </param> # -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; ')