From d70afadf6eb6393a9abc066d04a0bf6d3c0aaafd Mon Sep 17 00:00:00 2001
From: John Johansen <john.johansen@canonical.com>
Date: Fri, 4 Aug 2006 17:16:47 +0000
Subject: [PATCH] change init script to use skipped_msg

---
 parser/rc.apparmor.functions | 10 +++++-----
 parser/rc.apparmor.suse      |  5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/parser/rc.apparmor.functions b/parser/rc.apparmor.functions
index 6c48224cf..ad5b878ee 100644
--- a/parser/rc.apparmor.functions
+++ b/parser/rc.apparmor.functions
@@ -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
 }
 
diff --git a/parser/rc.apparmor.suse b/parser/rc.apparmor.suse
index cd134dae8..8fac2b15e 100644
--- a/parser/rc.apparmor.suse
+++ b/parser/rc.apparmor.suse
@@ -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}"
 }