# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: intrigeri@boum.org-20120423155334-0qnc7lxl66d23beq # target_branch: file:///home/intrigeri/tmp/debian/apparmor/kees/ # testament_sha1: d40eb906eec7cb6be7f5fa9d141a1250f69a36fa # timestamp: 2012-04-23 18:09:03 +0200 # base_revision_id: kees@outflux.net-20120209231854-6thrfa4i0sad6nsg # # Begin patch === modified file 'debian/apparmor.init' --- debian/apparmor.init 2010-11-05 01:23:33 +0000 +++ debian/apparmor.init 2012-04-23 15:53:34 +0000 @@ -24,10 +24,11 @@ # ### BEGIN INIT INFO # Provides: apparmor -# Required-Start: $remote_fs +# Required-Start: # Required-Stop: umountfs # Default-Start: S # Default-Stop: +# X-Start-Before: networking network-manager # Short-Description: AppArmor initialization # Description: AppArmor init script. This script loads all AppArmor profiles. ### END INIT INFO === modified file 'debian/lib/apparmor/functions' --- debian/lib/apparmor/functions 2011-06-03 13:51:54 +0000 +++ debian/lib/apparmor/functions 2012-04-23 15:52:49 +0000 @@ -33,10 +33,9 @@ (ls -1 "$PROFILES" | egrep -v '(\.dpkg-(new|old|dist|bak)|~)$' | \ while read profile; do if [ -f "$PROFILES"/"$profile" ]; then - echo "$PROFILES"/"$profile" + "$PARSER" "$@" -- "$PROFILES"/"$profile" fi - done) | \ - xargs -n1 -d"\n" -P$(getconf _NPROCESSORS_ONLN) "$PARSER" "$@" -- + done) } load_configured_profiles() { # Begin bundle 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 Ic4s+cdkRmN6PRA04WkTEgY/+LuSKcKEgIvX2qg=