2
0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-30 22:05:27 +00:00

Display improvements in rc.apparmor.functions

* Don't call aa_log_action_end after calling aa_log_failure_msg, because
  a generic "failure" message will be outputted twice by the Red Hat and
  Slackware init scripts.
* Don't append a space to the initial output from apparmor_stop, in line
  with other usages of aa_log_daemon_msg.
This commit is contained in:
Chris Novakovic
2019-08-30 13:40:51 +01:00
committed by intrigeri
parent 2f2eab3b21
commit 7f64db1f19

View File

@@ -159,7 +159,6 @@ parse_profiles() {
# run the parser on all of the apparmor profiles
if [ ! -f "$PARSER" ]; then
aa_log_failure_msg "AppArmor parser not found"
aa_log_action_end 1
exit 1
fi
@@ -266,7 +265,7 @@ remove_profiles() {
}
apparmor_stop() {
aa_log_daemon_msg "Unloading AppArmor profiles "
aa_log_daemon_msg "Unloading AppArmor profiles"
remove_profiles
rc=$?
aa_log_end_msg "$rc"