rebuild with separate debuginfo build-ids

[packages/apparmor-parser.git] / apparmor-parser.init

diff --git a/apparmor-parser.init b/apparmor-parser.init
index 5217f704df9cef0da315462d568b322a2db7b69b..0474f7db619c5465dc9b7f5053bea7e08aae9956 100644 (file)
--- a/apparmor-parser.init
+++ b/apparmor-parser.init
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # chkconfig: 2345 01 99
 # description: AppArmor rc file. This rc script inserts the apparmor \
 #             module and runs the parser on the /etc/apparmor.d/ \
@@ -9,26 +9,26 @@
 . /etc/rc.d/init.d/functions
 
 aa_log_skipped_msg() {
-       echo -n "$*"
-       #success
-       echo
+       busy
+       fail
+       [ -n "$*" ] && echo "$*"
 }
 aa_log_success_msg() {
-       echo -n "$*"
-       #success
-       echo
+       busy
+       ok
+       [ -n "$*" ] && echo "$*"
 }
 
 aa_log_warning_msg() {
-       echo -n "$*"
-       #warning
-       echo
+       busy
+       fail
+       [ -n "$*" ] && echo "$*"
 }
 
 aa_log_failure_msg() {
-       echo -n "$*"
-       #failure
-       echo
+       busy
+       fail
+       [ -n "$*" ] && echo "$*"
 }
 
 aa_action() {
@@ -38,20 +38,53 @@ aa_action() {
        return $?
 }
 
-. /etc/apparmor/rc.apparmor.functions
+# new in 2.5 (some broken)
+aa_log_action_begin() {
+       :
+}
+
+aa_log_action_start() {
+       :
+}
+
+aa_log_action_end() {
+       :
+}
+
+aa_log_daemon_msg() {
+       :
+}
+
+aa_log_end_msg() {
+       :
+}
+
+log_end_msg() {
+       aa_log_end_msg $*
+}
+
+. /lib/apparmor/rc.apparmor.functions
 
 RETVAL=0
 case "$1" in
 start)
+       msg_starting apparmor
+       started
        apparmor_start
        ;;
 stop)
+       msg_stopping apparmor
+       started
        apparmor_stop
        ;;
 restart|reload|force-reload)
+       msg_reloading apparmor
+       started
        apparmor_restart
        ;;
 try-restart)
+       msg_reloading
+       started
        apparmor_try_restart
        ;;
 debug)