From b2b981080b7bca27c57ad844f03041325eb88fe5 Mon Sep 17 00:00:00 2001
From: Thomas Parrott <thomas.parrott@canonical.com>
Date: Fri, 5 Jul 2024 11:32:03 +0100
Subject: [PATCH] lxd: Bump to pre LXD 4.0.10

Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
---
 snapcraft.yaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index c0601f98..7852606d 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1149,7 +1149,7 @@ parts:
   lxd:
     source: https://github.com/canonical/lxd
     source-type: git
-    source-tag: lxd-4.0.9
+    source-commit: 7a958a56bc6a370046878a2baaaaaded748713e7 # Pre LXD 4.0.10
     after:
       - lxc
       - dqlite
@@ -1196,9 +1196,6 @@ parts:
       git config user.email "noreply@lists.canonical.com"
       git config user.name "LXD snap builder"
 
-      git cherry-pick 2c5b0078a0e84ab62c9494e32e131d0686bb0c18  # lxd/devlxd: Don't expand format strings
-      git cherry-pick af5c49e020877c238510eb096ac586e9708721a6  # lxd/instance/qemu: Set spawn=allow
-
       # Setup build environment
       export GOPATH=$(realpath ./.go)
       export CGO_CFLAGS="-I${SNAPCRAFT_STAGE}/include/ -I${SNAPCRAFT_STAGE}/usr/local/include/"