mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-04 00:14:44 +01:00
Support unloading profiles in kill and prompt mode
... in aa-teardown (actually everything that uses rc.apparmor.functions) and aa-remove-unknown. Fixes: https://bugs.launchpad.net/ubuntu/+source/apparmor/+bug/2093797
This commit is contained in:
parent
b4cb33b488
commit
1c2d79de7f
2 changed files with 2 additions and 2 deletions
|
@ -253,7 +253,7 @@ remove_profiles() {
|
|||
retval=0
|
||||
# We filter child profiles as removing the parent will remove
|
||||
# the children
|
||||
sed -e "s/ (\(enforce\|complain\|unconfined\))$//" "$SFS_MOUNTPOINT/profiles" | \
|
||||
sed -e "s/ (\(enforce\|complain\|prompt\|kill\|unconfined\))$//" "$SFS_MOUNTPOINT/profiles" | \
|
||||
LC_COLLATE=C sort | grep -v // | {
|
||||
while read -r profile ; do
|
||||
printf "%s" "$profile" > "$SFS_MOUNTPOINT/.remove"
|
||||
|
|
|
@ -89,7 +89,7 @@ LOADED_PROFILES=$("$PARSER" -N $PROFILE_DIRS) || {
|
|||
echo "$LOADED_PROFILES" | awk '
|
||||
BEGIN {
|
||||
while (getline < "'${PROFILES}'" ) {
|
||||
sub(/ \((enforce|complain|unconfined)\)$/, "", $0);
|
||||
sub(/ \((enforce|complain|prompt|kill|unconfined)\)$/, "", $0);
|
||||
if (match($0, /^libvirt-[0-9a-f\-]+$/) == 0)
|
||||
arr[$0] = $0
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue