SOURCES: apparmor-parser.init - a bit better but still doesn't match pld style

[arekm]

Author: arekm                        Date: Thu May 29 21:09:15 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- a bit better but still doesn't match pld style

---- Files affected:
SOURCES:
   apparmor-parser.init (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/apparmor-parser.init
diff -u SOURCES/apparmor-parser.init:1.3 SOURCES/apparmor-parser.init:1.4
--- SOURCES/apparmor-parser.init:1.3	Thu May 29 20:21:15 2008
+++ SOURCES/apparmor-parser.init	Thu May 29 23:09:09 2008
@@ -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() {
@@ -43,15 +43,23 @@
 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)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/apparmor-parser.init?r1=1.3&r2=1.4&f=u