Revert "apparmor: Add support for local profile customizations"

As it turns out, apparmor 2.x and 3.x behave differently or have differing
levels of support for local customizations of profiles and profile
abstractions. Additionally the apparmor 2.x tools do not cope well with
'include if exists'. Revert this commit until a more complete solution is
developed that works with old and new apparmor.

Reverts: 9b743ee190
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Jim Fehlig 2023-06-27 17:09:15 -06:00
parent d725932a28
commit d7fb8deb6a
7 changed files with 5 additions and 19 deletions

View File

@ -34,10 +34,8 @@ install_data(
install_dir: apparmor_dir / 'libvirt',
)
foreach name : apparmor_gen_profiles
install_data(
'@0@.local'.format(name),
install_data(
'usr.lib.libvirt.virt-aa-helper.local',
install_dir: apparmor_dir / 'local',
rename: name,
)
endforeach
rename: 'usr.lib.libvirt.virt-aa-helper',
)

View File

@ -139,7 +139,4 @@ profile libvirtd @sbindir@/libvirtd flags=(attach_disconnected) {
/usr/{lib,lib64,lib/qemu,libexec}/qemu-bridge-helper rmix,
}
# Site-specific additions and overrides. See local/README for details.
include if exists <local/usr.sbin.libvirtd>
}

View File

@ -1 +0,0 @@
# Site-specific additions and overrides for 'usr.sbin.libvirtd'

View File

@ -132,7 +132,4 @@ profile virtqemud @sbindir@/virtqemud flags=(attach_disconnected) {
/usr/{lib,lib64,lib/qemu,libexec}/qemu-bridge-helper rmix,
}
# Site-specific additions and overrides. See local/README for details.
include if exists <local/usr.sbin.virtqemud>
}

View File

@ -1 +0,0 @@
# Site-specific additions and overrides for 'usr.sbin.virtqemud'

View File

@ -52,7 +52,4 @@ profile virtxend @sbindir@/virtxend flags=(attach_disconnected) {
@libexecdir@/libvirt_iohelper ix,
/etc/libvirt/hooks/** rmix,
/etc/xen/scripts/** rmix,
# Site-specific additions and overrides. See local/README for details.
include if exists <local/usr.sbin.virtxend>
}

View File

@ -1 +0,0 @@
# Site-specific additions and overrides for 'usr.sbin.virtxend'