Skip to content

Commit

Permalink
lxd: Fix apparmor regression after vendoring apparmor (5.21-candidate) (
Browse files Browse the repository at this point in the history
canonical#542)

- lxd/apparmor/instance_lxc: allow procfs for unprivileged containers
(canonical/lxd#13997)
- lxd/apparmor/instance_lxc: allow sysfs for unprivileged containers
(canonical/lxd#14010)
  • Loading branch information
tomponline authored Sep 2, 2024
2 parents 22f93f4 + f2091fc commit 2f4ba6b
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1480,6 +1480,8 @@ parts:
git cherry-pick -x d3f044ba23e9ef633e7c99e8c2468678a6a58e5a # lxd/storage/backend/lxd: Pass full snapshot name when validating import in CreateInstanceFromBackup
git cherry-pick -x c0cfe64000c4b7c658347cf4b2833594ae0e6fc3 # lxd/instance/instance/utils: Don't allow snapshots named ".." in ValidName
git cherry-pick -x 8415f4ada4800e547c7c8764f28d83e7b6cab6a0 # lxd/instance: if storage location is remote, make cluster self healing available, and vm can migrate when src member is offline also
git cherry-pick -x c94652490e8bf302ff63e199ce9bbacc11a50a29 # lxd/apparmor/instance_lxc: allow procfs for unprivileged containers
git cherry-pick -x 9365358d847fac1ce83329801f5b78374bb6726f # lxd/apparmor/instance_lxc: allow sysfs for unprivileged containers
# Setup build environment
export GOPATH="$(realpath ./.go)"
Expand Down

0 comments on commit 2f4ba6b

Please sign in to comment.