Skip to content

Commit

Permalink
Revert "snapcraft.yaml: enable unconfined mode in lxd-support interface"
Browse files Browse the repository at this point in the history
This reverts commit 25ca3a1.

Unfortunately, we have to revert this once again as it causes breakage.

See also:
canonical/lxd#14258 (comment)
https://bugs.launchpad.net/apparmor/+bug/2067900

Signed-off-by: Alexander Mikhalitsyn <[email protected]>
  • Loading branch information
mihalicyn committed Oct 11, 2024
1 parent 971afab commit c737d40
Showing 1 changed file with 17 additions and 20 deletions.
37 changes: 17 additions & 20 deletions snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,6 @@ plugs:
interface: content
content: qemu-external-binaries
target: $SNAP/external/qemu
lxd-support-with-unconfined-mode:
interface: lxd-support
enable-unconfined-mode: true

layout:
/usr/share/libdrm:
Expand All @@ -96,7 +93,7 @@ apps:
command: commands/daemon.activate
daemon: oneshot
plugs:
- lxd-support-with-unconfined-mode
- lxd-support
- system-observe

daemon:
Expand All @@ -111,7 +108,7 @@ apps:
slots:
- lxd
plugs:
- lxd-support-with-unconfined-mode
- lxd-support
- network-bind
- system-observe
sockets:
Expand All @@ -125,7 +122,7 @@ apps:
restart-condition: on-failure
daemon: simple
plugs:
- lxd-support-with-unconfined-mode
- lxd-support
- network-bind
- system-observe
sockets:
Expand All @@ -137,68 +134,68 @@ apps:
command: commands/lxc
completer: etc/bash_completion.d/snap.lxd.lxc
plugs:
- lxd-support-with-unconfined-mode
- lxd-support
- system-observe

lxd:
command: commands/lxd
plugs:
- lxd-support-with-unconfined-mode
- lxd-support
- system-observe

# Sub-commands
buginfo:
command: commands/buginfo
plugs:
- lxd-support-with-unconfined-mode
- lxd-support
- system-observe
check-kernel:
command: commands/lxd-check-kernel
plugs:
- lxd-support-with-unconfined-mode
- lxd-support
- system-observe

hooks:
connect-plug-ceph-conf:
plugs:
- lxd-support-with-unconfined-mode
- lxd-support
- system-observe
disconnect-plug-ceph-conf:
plugs:
- lxd-support-with-unconfined-mode
- lxd-support
- system-observe
connect-plug-ovn-certificates:
plugs:
- lxd-support-with-unconfined-mode
- lxd-support
- system-observe
disconnect-plug-ovn-certificates:
plugs:
- lxd-support-with-unconfined-mode
- lxd-support
- system-observe
connect-plug-ovn-chassis:
plugs:
- lxd-support-with-unconfined-mode
- lxd-support
- system-observe
disconnect-plug-ovn-chassis:
plugs:
- lxd-support-with-unconfined-mode
- lxd-support
- system-observe
connect-plug-qemu-external:
plugs:
- lxd-support-with-unconfined-mode
- lxd-support
- system-observe
disconnect-plug-qemu-external:
plugs:
- lxd-support-with-unconfined-mode
- lxd-support
- system-observe
configure:
plugs:
- lxd-support-with-unconfined-mode
- lxd-support
- network
- system-observe
remove:
plugs:
- lxd-support-with-unconfined-mode
- lxd-support
- system-observe

parts:
Expand Down

0 comments on commit c737d40

Please sign in to comment.