- updated URLs

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

diff --git a/apparmor-parser.init b/apparmor-parser.init
index 1f0181ddf1e97b9d58d8caf938bd96acda33f1ce..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/ \
@@ -8,60 +8,93 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
-sd_log_skipped_msg() {
-       echo -n "$*"
-       #success
-       echo
+aa_log_skipped_msg() {
+       busy
+       fail
+       [ -n "$*" ] && echo "$*"
 }
-sd_log_success_msg() {
-       echo -n "$*"
-       #success
-       echo
+aa_log_success_msg() {
+       busy
+       ok
+       [ -n "$*" ] && echo "$*"
 }
 
-sd_log_warning_msg() {
-       echo -n "$*"
-       #warning
-       echo
+aa_log_warning_msg() {
+       busy
+       fail
+       [ -n "$*" ] && echo "$*"
 }
 
-sd_log_failure_msg() {
-       echo -n "$*"
-       #failure
-       echo
+aa_log_failure_msg() {
+       busy
+       fail
+       [ -n "$*" ] && echo "$*"
 }
 
-sd_action() {
+aa_action() {
        STRING=$1
        shift
        run_cmd "$STRING" "$@"
        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)
-       subdomain_start
+       msg_starting apparmor
+       started
+       apparmor_start
        ;;
 stop)
-       subdomain_stop
+       msg_stopping apparmor
+       started
+       apparmor_stop
        ;;
 restart|reload|force-reload)
-       subdomain_restart
+       msg_reloading apparmor
+       started
+       apparmor_restart
        ;;
 try-restart)
-       subdomain_try_restart
+       msg_reloading
+       started
+       apparmor_try_restart
        ;;
 debug)
-       subdomain_debug
+       apparmor_debug
        ;;
 kill)
-       subdomain_kill
+       apparmor_kill
        ;;
 status)
-       subdomain_status
+       apparmor_status
        ;;
 *)
        msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|status|kill}"