diff --git a/parser/apparmor-parser.spec.in b/parser/apparmor-parser.spec.in index 2684a7cf9..d4ea530dd 100644 --- a/parser/apparmor-parser.spec.in +++ b/parser/apparmor-parser.spec.in @@ -35,9 +35,6 @@ Prereq: sed %if %{distro} == "suse" Prereq: %{insserv_prereq} aaa_base %endif -%if %{distro} == "rhel4" -Prereq: apparmor-master -%endif Obsoletes: subdomain_parser subdomain-parser Obsoletes: subdomain-parser-demo subdomain-parser-common subdomain-leaf-cert Obsoletes: libimnxcert diff --git a/parser/rc.apparmor.debian b/parser/rc.apparmor.debian index 774ddd1e5..37b9ac3b3 100644 --- a/parser/rc.apparmor.debian +++ b/parser/rc.apparmor.debian @@ -66,6 +66,11 @@ sd_log_failure_msg() { echo ": Failed." } +sd_log_skipped_msg() { + [ -n "$1" ] && echo -n $1 + echo ": Skipped." +} + usage() { echo "Usage: $0 {start|stop|restart|try-restart|reload|force-reload|status|kill}" } diff --git a/parser/rc.apparmor.redhat b/parser/rc.apparmor.redhat index 339b62a51..1f6015662 100644 --- a/parser/rc.apparmor.redhat +++ b/parser/rc.apparmor.redhat @@ -65,6 +65,12 @@ sd_log_warning_msg() { echo } +sd_log_skipped_msg() { + echo -n "$*" + warning + echo +} + sd_log_failure_msg() { echo -n "$*" failure diff --git a/parser/rc.apparmor.slackware b/parser/rc.apparmor.slackware index b26b34782..3df8c5d05 100644 --- a/parser/rc.apparmor.slackware +++ b/parser/rc.apparmor.slackware @@ -51,6 +51,11 @@ sd_log_failure_msg() { echo ": Failed." } +sd_log_skipped_msg() { + [ -n "$1" ] && echo -n $1 + echo ": Skipped." +} + usage() { echo "Usage: $0 {start|stop|restart|try-restart|reload|force-reload|status|kill}" }