snapcraft: Cherry-pick bug fixes

Signed-off-by: Thomas Parrott <[email protected]>
canonical · Nov 22, 2023 · 3ed9951 · 3ed9951
1 parent 2bb8f2a
commit 3ed9951
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/snapcraft.yaml b/snapcraft.yaml
@@ -1434,6 +1434,8 @@ parts:
       git cherry-pick 89d4048db8c35f0ec11a8cb1cb97f22534380150 # lxd/firewall: Fix nftables ACL template
       git cherry-pick c525e53aa59edaa8838dcd9b6fe853f4f595a57f # lxd/patches: Add cluster check for patches fixing volumes
       git cherry-pick 781905a01b68d68b4071643d947b75004ea4fad9 # lxd/instance/exec: Only use keepalives on TCP sockets
+      git cherry-pick 1a747fa8b64a6254fec7be2bd4153f3fbf459d96 # btrfs: Add function to check subvolumes in a given path
+      git cherry-pick 4f2ace5a1cf32aa0724ce89d37ba9e3a21b4bdf6 # btrfs: Use hasSubvolumes when creating a new pool
 
       # Setup build environment
       export GOPATH="$(realpath ./.go)"