From dc629f41149b03cebc50cd8b55448a418a84a737 Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@canonical.com>
Date: Tue, 11 Jan 2022 16:26:57 -0800
Subject: [PATCH] Do not look for a base snap on snaps of type base, because
 recursive dependencies are not allowed for snaps.  LP: #1957123.

---
 debian/changelog     |  7 +++++++
 live-build/functions | 12 ++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a9180696..cf01d4b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.664.37) UNRELEASED; urgency=medium
+
+  * Do not look for a base snap on snaps of type base, because recursive
+    dependencies are not allowed for snaps.  LP: #1957123.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 11 Jan 2022 15:38:05 -0800
+
 livecd-rootfs (2.664.36) focal; urgency=medium
 
   * live-build/ubuntu-server/hooks/032-installer-squashfs.binary: be more
diff --git a/live-build/functions b/live-build/functions
index 270ed1dc..b3692b5e 100644
--- a/live-build/functions
+++ b/live-build/functions
@@ -552,12 +552,16 @@ _snap_preseed() {
                 exit 1
             fi
 
-            local core_snap=$(echo "$snap_info" | grep '^base:' | awk '{print $2}')
+            local snap_type=$(echo "$snap_info" | awk '/^type:/ { print $2 }')
 
-            # If snap info does not list a base use 'core'
-            core_snap=${core_snap:-core}
+            if [ "$snap_type" != base ]; then
+                local core_snap=$(echo "$snap_info" | grep '^base:' | awk '{print $2}')
 
-            _snap_preseed $CHROOT_ROOT $core_snap stable
+                # If snap info does not list a base use 'core'
+                core_snap=${core_snap:-core}
+
+                _snap_preseed $CHROOT_ROOT $core_snap stable
+            fi
             ;;
     esac