From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sat, 8 Jun 2024 10:16:31 +0000 (+0200)
Subject: action: Use aa-teardown to disable apparmor
X-Git-Tag: v23.1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cc81fb92ef0bb1ef7d51ac1e76327614d41ed74;p=thirdparty%2Fmkosi.git

action: Use aa-teardown to disable apparmor

systemctl stop apparmor doesn't seem to be sufficient, aa-teardown
on the other hand seems to do the trick.
---

diff --git a/action.yaml b/action.yaml
index abbc61252..267e199db 100644
--- a/action.yaml
+++ b/action.yaml
@@ -44,8 +44,9 @@ runs:
   - name: Disable and mask apparmor service
     shell: bash
     run: |
-        sudo systemctl disable --now apparmor
-        sudo systemctl mask apparmor
+        # This command fails with a non-zero error code even though it unloads the apparmor profiles.
+        # https://gitlab.com/apparmor/apparmor/-/issues/403
+        sudo aa-teardown || true
         sudo apt-get remove apparmor
 
   - name: Dependencies