lxd: Cherry-pick Oracular container apparmor fixes

canonical/lxd#13681 canonical/lxd#13820 Signed-off-by: Thomas Parrott <[email protected]>
tomponline · Jul 31, 2024 · 552bb80 · 552bb80
1 parent 5ad64c2
commit 552bb80
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/snapcraft.yaml b/snapcraft.yaml
@@ -1435,6 +1435,9 @@ parts:
       git cherry-pick -x b551f47dfdd8699772c7b8fd2cfb72fe439ad0c7 # lxd/certificates: Improve expiry validation checks in clusterMemberJoinTokenValid
       git cherry-pick -x 39f97587a2c30eb59ac78979d7b60e11dfd6132e # lxd/certificates: Improve validation in certificateTokenValid
       git cherry-pick -x cd43ad507584dc4971c9ce3c8b12167a93fb75b7 # lxd/instance/drivers/driver/common: Fix crash when device doesn't return run config when being live updated
+      git cherry-pick -x 47180a352654bee9a994db714801813a59cfbb18 # lxd/apparmor/feature_check: add infastructure to check AppArmor features
+      git cherry-pick -x b5a4a6540e793120b85a3b280003fce236e6a56f # lxd/apparmor/instance_lxc: allow nosymfollow mount flag
+      git cherry-pick -x 86c3d515662068d825d23387623932bca96bc6aa # lxd/apparmor/instance_lxc: allow nosymfollow mount flag in more cases
 
       # Setup build environment
       export GOPATH="$(realpath ./.go)"