mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-02 15:25:27 +00:00
Code Issues Releases Wiki Activity

Merge branch 'cboltz-subshell' into 'master'

Browse Source 
remove_profiles(): Fix returning $retval

See merge request apparmor/apparmor!352

Acked-by: Eric Chiang <ericchiang@google.com> for 2.11..master

(cherry picked from commit c9148a304c)

be02f008 remove_profiles(): Fix returning $retval
This commit is contained in:
Christian Boltz
2019-03-18 17:45:53 +00:00
parent 75236d62e2
commit d4f1f9310b
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
parser/rc.apparmor.functions
View File

@@ -409,7 +409,8 @@ remove_profiles() {
# We filter child profiles as removing the parent will remove # We filter child profiles as removing the parent will remove
# the children # the children
sed -e "s/ (\(enforce\|complain\))$//" "$SFS_MOUNTPOINT/profiles" | \ sed -e "s/ (\(enforce\|complain\))$//" "$SFS_MOUNTPOINT/profiles" | \
LC_COLLATE=C sort | grep -v // | while read profile ; do LC_COLLATE=C sort | grep -v // | {
while read profile ; do
echo -n "$profile" > "$SFS_MOUNTPOINT/.remove" echo -n "$profile" > "$SFS_MOUNTPOINT/.remove"
rc=$? rc=$?
if [ ${rc} -ne 0 ] ; then if [ ${rc} -ne 0 ] ; then
@@ -418,6 +419,7 @@ remove_profiles() {
done done
return ${retval} return ${retval}
} }
}
apparmor_stop() { apparmor_stop() {
aa_log_daemon_msg "Unloading AppArmor profiles " aa_log_daemon_msg "Unloading AppArmor profiles "