You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
80 lines
2.8 KiB
80 lines
2.8 KiB
7 years ago
|
From baad1483ed0a699509f66abac6708797f370f888 Mon Sep 17 00:00:00 2001
|
||
|
From: Matthias Maier <tamiko@kyomu.43-1.org>
|
||
|
Date: Sun, 22 Jan 2017 09:07:57 -0600
|
||
|
Subject: [PATCH] Update paths to Gentoo layout
|
||
|
|
||
|
---
|
||
|
examples/Makefile.am | 4 ++--
|
||
|
.../{usr.lib.libvirt.virt-aa-helper => usr.libexec.virt-aa-helper} | 4 ++--
|
||
|
examples/apparmor/usr.sbin.libvirtd | 6 ++++--
|
||
|
3 files changed, 8 insertions(+), 6 deletions(-)
|
||
|
rename examples/apparmor/{usr.lib.libvirt.virt-aa-helper => usr.libexec.virt-aa-helper} (90%)
|
||
|
|
||
|
diff --git a/examples/Makefile.am b/examples/Makefile.am
|
||
|
index 2956e14..d81e34b 100644
|
||
|
--- a/examples/Makefile.am
|
||
|
+++ b/examples/Makefile.am
|
||
|
@@ -23,7 +23,7 @@ EXTRA_DIST = \
|
||
|
apparmor/TEMPLATE.lxc \
|
||
|
apparmor/libvirt-qemu \
|
||
|
apparmor/libvirt-lxc \
|
||
|
- apparmor/usr.lib.libvirt.virt-aa-helper \
|
||
|
+ apparmor/usr.libexec.virt-aa-helper \
|
||
|
apparmor/usr.sbin.libvirtd \
|
||
|
lxcconvert/virt-lxc-convert \
|
||
|
polkit/libvirt-acl.rules \
|
||
|
@@ -70,7 +70,7 @@ admin_logging_SOURCES = admin/logging.c
|
||
|
if WITH_APPARMOR_PROFILES
|
||
|
apparmordir = $(sysconfdir)/apparmor.d/
|
||
|
apparmor_DATA = \
|
||
|
- apparmor/usr.lib.libvirt.virt-aa-helper \
|
||
|
+ apparmor/usr.libexec.virt-aa-helper \
|
||
|
apparmor/usr.sbin.libvirtd \
|
||
|
$(NULL)
|
||
|
|
||
|
diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.libexec.virt-aa-helper
|
||
|
similarity index 90%
|
||
|
rename from examples/apparmor/usr.lib.libvirt.virt-aa-helper
|
||
|
rename to examples/apparmor/usr.libexec.virt-aa-helper
|
||
|
index 4a8f197..a6072f1 100644
|
||
|
--- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
|
||
|
+++ b/examples/apparmor/usr.libexec.virt-aa-helper
|
||
|
@@ -1,7 +1,7 @@
|
||
|
# Last Modified: Mon Apr 5 15:10:27 2010
|
||
|
#include <tunables/global>
|
||
|
|
||
|
-profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
|
||
|
+profile virt-aa-helper /usr/libexec/virt-aa-helper {
|
||
|
#include <abstractions/base>
|
||
|
|
||
|
# needed for searching directories
|
||
|
@@ -20,7 +20,7 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
|
||
|
/sys/devices/ r,
|
||
|
/sys/devices/** r,
|
||
|
|
||
|
- /usr/{lib,lib64}/libvirt/virt-aa-helper mr,
|
||
|
+ /usr/libexec/virt-aa-helper mr,
|
||
|
/{usr/,}sbin/apparmor_parser Ux,
|
||
|
|
||
|
/etc/apparmor.d/libvirt/* r,
|
||
|
diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd
|
||
|
index 8893e75..f0b471c 100644
|
||
|
--- a/examples/apparmor/usr.sbin.libvirtd
|
||
|
+++ b/examples/apparmor/usr.sbin.libvirtd
|
||
|
@@ -59,8 +59,10 @@
|
||
|
audit deny /sys/kernel/security/apparmor/.* rwxl,
|
||
|
/sys/kernel/security/apparmor/profiles r,
|
||
|
/usr/{lib,lib64}/libvirt/* PUxr,
|
||
|
- /usr/{lib,lib64}/libvirt/libvirt_parthelper ix,
|
||
|
- /usr/{lib,lib64}/libvirt/libvirt_iohelper ix,
|
||
|
+ /usr/libexec/virt-aa-helper PUxr,
|
||
|
+ /usr/libexec/libvirt_lxc PUxr,
|
||
|
+ /usr/libexec/libvirt_parthelper ix,
|
||
|
+ /usr/libexec/libvirt_iohelper ix,
|
||
|
/etc/libvirt/hooks/** rmix,
|
||
|
/etc/xen/scripts/** rmix,
|
||
|
|
||
|
--
|
||
|
2.10.2
|
||
|
|