Skip to content

[release/2.0] apparmor: Set abi conditionally#13277

Merged
mxpv merged 1 commit into
containerd:release/2.0from
cpuguy83:2.0_fix_apparmor_old
Apr 23, 2026
Merged

[release/2.0] apparmor: Set abi conditionally#13277
mxpv merged 1 commit into
containerd:release/2.0from
cpuguy83:2.0_fix_apparmor_old

Conversation

@cpuguy83

@cpuguy83 cpuguy83 commented Apr 23, 2026

Copy link
Copy Markdown
Member

The "abi" keyword was added for apparmor 3.0
The original change to add this ended up breaking versions < 3.0. The abi itself is a macro in /etc/apparmor.d so we can check if the macro exists to determine if we can set an abi in the template.

(cherry picked from commit d88e83a)

Cherry-picked from #13268

Set AppArmor abi conditionally to support versions < 3.0

The "abi" keyword was added for apparmor 3.0
The original change to add this ended up breaking versions < 3.0.
The abi itself is a macro in /etc/apparmor.d so we can check if the
macro exists to determine if we *can* set an abi in the template.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit d88e83a)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
@github-project-automation github-project-automation Bot moved this to Needs Triage in Pull Request Review Apr 23, 2026
@samuelkarp samuelkarp changed the title apparmor: Set abi conditionally [release/2.0] apparmor: Set abi conditionally Apr 23, 2026
@dosubot dosubot Bot added the kind/bug label Apr 23, 2026
@github-project-automation github-project-automation Bot moved this from Needs Triage to Review In Progress in Pull Request Review Apr 23, 2026
@mxpv mxpv merged commit c60e49f into containerd:release/2.0 Apr 23, 2026
52 checks passed
@github-project-automation github-project-automation Bot moved this from Review In Progress to Done in Pull Request Review Apr 23, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

4 participants