From daea4138ee2d29b540718b655e89db2862e9902b Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sun, 14 Feb 2021 21:39:38 +0000 Subject: [PATCH] apparmor: load profiles in parallel --- srcpkgs/apparmor/template | 2 +- srcpkgs/runit-void/files/09-apparmor.sh | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template index 6e7300cff1e..dfbd3ef472f 100644 --- a/srcpkgs/apparmor/template +++ b/srcpkgs/apparmor/template @@ -1,7 +1,7 @@ # Template file for 'apparmor' pkgname=apparmor version=3.0.1 -revision=2 +revision=3 wrksrc="${pkgname}-v${version}" build_wrksrc=libraries/libapparmor build_style=gnu-configure diff --git a/srcpkgs/runit-void/files/09-apparmor.sh b/srcpkgs/runit-void/files/09-apparmor.sh index 7d8d09ee80f..b99afbab046 100644 --- a/srcpkgs/runit-void/files/09-apparmor.sh +++ b/srcpkgs/runit-void/files/09-apparmor.sh @@ -18,15 +18,7 @@ if [ -n "$APPARMOR" ]; then [ "$APPARMOR" = "complain" ] && AACOMPLAIN="-C" if [ -d /etc/apparmor.d -a -x /usr/bin/apparmor_parser ]; then - for profile in /etc/apparmor.d/*; do - case "$profile" in - *.new-*_*) continue ;; - esac - if [ -f "$profile" ]; then - printf '* Load profile %s: %s\n' "($APPARMOR)" "$profile" - apparmor_parser -a $AACOMPLAIN "$profile" - fi - done + apparmor_parse -a $AACOMPLAIN $(find /etc/apparmor.d -type f -maxdepth 1 ! -name '*.new-*_*') else printf '! AppArmor installation problem - ensure you have installed apparmor package\n' fi