mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-04 08:24:42 +01:00
change init script to use skipped_msg
This commit is contained in:
parent
313c2a35ec
commit
d70afadf6e
2 changed files with 10 additions and 5 deletions
|
@ -125,13 +125,13 @@ function parse_profiles() {
|
|||
fi
|
||||
|
||||
if [ ! -d "$PROFILE_DIR" ]; then
|
||||
sd_log_failure_msg "- Profile directory not found"
|
||||
exit 1
|
||||
sd_log_skipped_msg "- Profile directory not found\nNo AppArmor policy loaded."
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [ "X" == "X$(ls $PROFILE_DIR/)" ]; then
|
||||
sd_log_failure_msg "- No profiles found"
|
||||
exit 1
|
||||
sd_log_skipped_msg "- No profiles found\nNo AppArmor policy loaded."
|
||||
return 1
|
||||
fi
|
||||
|
||||
for profile in $PROFILE_DIR/*; do
|
||||
|
@ -379,7 +379,7 @@ function subdomain_start() {
|
|||
if [ $(wc -l "$SFS_MOUNTPOINT/profiles" | awk '{print $1}') -eq 0 ] ; then
|
||||
parse_profiles load
|
||||
else
|
||||
sd_log_warning_msg "Loading AppArmor profiles - AppArmor already loaded with profiles. Not loading profiles."
|
||||
sd_log_skipped_msg "Loading AppArmor profiles - AppArmor already loaded with profiles."
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
|
@ -78,6 +78,11 @@ function sd_log_failure_msg() {
|
|||
log_failure_msg $*
|
||||
}
|
||||
|
||||
function sd_log_skipped_msg() {
|
||||
echo -en "$@"
|
||||
echo -e "$rc_skipped"
|
||||
}
|
||||
|
||||
function usage() {
|
||||
echo "Usage: $0 {start|stop|restart|try-restart|reload|force-reload|status|kill}"
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue