Attachment 113668 Details for Bug 89231 – Remove <apparmor/> from default system.conf, session.conf

[patch] Remove <apparmor/> from default system.conf, session.conf

0001-Remove-apparmor-from-default-system.conf-session.con.patch (text/plain), 1.72 KB, created by Simon McVittie on 2015-02-19 15:54:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2015-02-19 15:54:44 UTC

Size: 1.72 KB

patch

obsolete

>From b54cdba8cd642a37183fd2be19a67e5c698833d9 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 19 Feb 2015 15:52:17 +0000
>Subject: [PATCH] Remove <apparmor/> from default system.conf, session.conf
>
>The AppArmor and SELinux modes both default to "enabled" (i.e.
>enable it if and only if it is supported), so there is no need to
>add their element to system.conf unless a system integrator wants
>to set them to either required or disabled.
>
>However, if we add <apparmor/> on upgrade from 1.9.10 to 1.9.12,
>any subsequent attempts to reload bus configuration before the
>next reboot will fail, because the dbus-daemon that is already
>running does not support that element.
>---
> bus/session.conf.in | 3 ---
> bus/system.conf.in  | 3 ---
> 2 files changed, 6 deletions(-)
>
>diff --git a/bus/session.conf.in b/bus/session.conf.in
>index d2e3f2d..cfe9544 100644
>--- a/bus/session.conf.in
>+++ b/bus/session.conf.in
>@@ -25,9 +25,6 @@
>     <allow own="*"/>
>   </policy>
> 
>-  
>-  <apparmor mode="enabled"/>
>-
>   
>   <includedir>session.d</includedir>
>diff --git a/bus/system.conf.in b/bus/system.conf.in
>index fc472bd..ac78c73 100644
>--- a/bus/system.conf.in
>+++ b/bus/system.conf.in
>@@ -97,9 +97,6 @@
>            send_interface="org.freedesktop.DBus.Debug.Stats"/>
>   </policy>
> 
>-  
>-  <apparmor mode="enabled"/>
>-
>   
>   <includedir>system.d</includedir>
>-- 
>2.1.4
>

Actions: View | Splinter Review

Attachments on bug 89231: 113668

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.