- up to 2.1.2

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

diff --git a/apparmor-parser-init-args.patch b/apparmor-parser-init-args.patch
index d692abdee782b4d51c65a4cf4aeebfab61378514..accbde05d05f07de41ff87f10464f0d4289a0845 100644 (file)
--- a/apparmor-parser-init-args.patch
+++ b/apparmor-parser-init-args.patch
@@ -31,7 +31,7 @@ Index: trunk-forge/parser/rc.apparmor.functions
                        PARSER_MSG="Reloading AppArmor profiles "
                        ;;
                *)
-@@ -143,7 +144,7 @@ parse_profiles() {
+@@ -151,7 +152,7 @@ parse_profiles() {
                        logger -t "AppArmor(init)" -p daemon.warn "Skipping profile $profile"
                        STATUS=2
                elif [ -f "${profile}" ] ; then
@@ -40,10 +40,10 @@ Index: trunk-forge/parser/rc.apparmor.functions
                        if [ $? -ne 0 ]; then
                                echo " Profile $profile failed to load"
                                STATUS=1
-@@ -180,7 +181,7 @@ profiles_names_list() {
-               then 
-                       echo "nop" >/dev/null
-               elif [ -f "${profile}" ] ; then
+@@ -183,7 +184,7 @@ profiles_names_list() {
+ 
+       for profile in $PROFILE_DIR/*; do
+               if ! skip_profile "${profile}" && [ -f "${profile}" ] ; then
 -                      LIST_ADD=$($PARSER $ABSTRACTIONS -N "$profile" | grep -v '\^')
 +                      LIST_ADD=$($PARSER $ABSTRACTIONS ${AA_PARSER_ARGS} -N "$profile" | grep -v '\^')
                        if [ $? -eq 0 ]; then