mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-22 10:07:12 +00:00
Code Issues Releases Wiki Activity

profile-load: use less ambiguous if/then construct

Browse Source 
As shellcheck taught me
today (https://github.com/koalaman/shellcheck/wiki/SC2015),
"A && B || C is not if-then-else. C may run when A is true".

It does not matter here in practice, because worst case we would run "true" once
too many, but still.
This commit is contained in:
intrigeri 2022-02-15 07:31:31 +00:00
parent 35f23a6da1
commit 322b3f4d3e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
parser/profile-load
View File

@ -24,7 +24,11 @@
. /lib/apparmor/rc.apparmor.functions . /lib/apparmor/rc.apparmor.functions
# do not load in a container # do not load in a container
[ -x /usr/bin/systemd-detect-virt ] && systemd-detect-virt --quiet --container && ! is_container_with_internal_policy && exit 0 || true if [ -x /usr/bin/systemd-detect-virt ] && \
systemd-detect-virt --quiet --container && \
! is_container_with_internal_policy; then
exit 0
fi
[ -d /rofs/etc/apparmor.d ] && exit 0 # do not load if running liveCD [ -d /rofs/etc/apparmor.d ] && exit 0 # do not load if running liveCD