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 938EE59CA3 for ; Fri, 11 Mar 2016 17:20:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C982921C05D; Fri, 11 Mar 2016 17:20:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A312921C051 for ; Fri, 11 Mar 2016 17:20:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A6A4B340B7E for ; Fri, 11 Mar 2016 17:20:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 312F52331 for ; Fri, 11 Mar 2016 17:20:11 +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: <1457716538.b0c79d2a055903a37b3aaf0dd1eb7e2fcfc90224.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.te X-VCS-Directories: policy/modules/system/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: b0c79d2a055903a37b3aaf0dd1eb7e2fcfc90224 X-VCS-Branch: master Date: Fri, 11 Mar 2016 17:20:11 +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: 08d5c6a7-07fc-467c-9974-f39e7b463a97 X-Archives-Hash: 96a1b5a8992d189a9b9e1697d9e1c13b commit: b0c79d2a055903a37b3aaf0dd1eb7e2fcfc90224 Author: Jason Zaman perfinion com> AuthorDate: Mon Mar 7 08:45:36 2016 +0000 Commit: Jason Zaman gentoo org> CommitDate: Fri Mar 11 17:15:38 2016 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=b0c79d2a system/init: move systemd_ interfaces into optional_policy When ifdef systemd is enabled, some interfaces from systemd are called unconditionally. This makes migrating from non-systemd to systemd complicated since init is part of base and systemd is not so loading fails. Moving them into optional_policy fixes this. policy/modules/system/init.te | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/policy/modules/system/init.te b/policy/modules/system/init.te index fd559bc..1f59e2a 100644 --- a/policy/modules/system/init.te +++ b/policy/modules/system/init.te @@ -280,13 +280,15 @@ ifdef(`init_systemd',` seutil_read_file_contexts(init_t) - systemd_relabelto_kmod_files(init_t) - systemd_dbus_chat_logind(init_t) - # udevd is a "systemd kobject uevent socket activated daemon" udev_create_kobject_uevent_sockets(init_t) optional_policy(` + systemd_relabelto_kmod_files(init_t) + systemd_dbus_chat_logind(init_t) + ') + + optional_policy(` dbus_system_bus_client(init_t) dbus_connect_system_bus(init_t) ')