From 628134dfe79294e459650292d06133cad9fddaaf Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Thu, 18 May 2023 11:21:58 +1200
Subject: [PATCH] auto/config: alter check for unexpectedly seeded snaps in
 ubuntu-cpc:minimized build. As the build no longer implicitly seeds the snaps
 from the server seed, we can just assert no snaps are seeded. This fixes an
 autopkgtest regression but also cleaner.

---
 debian/changelog       |  4 ++++
 live-build/auto/config | 23 ++++++++---------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e240d416..094335a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ livecd-rootfs (2.840) UNRELEASED; urgency=medium
     to get their desktop packages. Previously most (all?) flavour builds got
     the snaps from that flavour's "desktop" seed implicitly added, but now an
     explicit add_task is needed.
+  * auto/config: alter check for unexpectedly seeded snaps in
+    ubuntu-cpc:minimized build. As the build no longer implicitly seeds the
+    snaps from the server seed, we can just assert no snaps are seeded. This
+    fixes an autopkgtest regression but also cleaner.
 
  -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Thu, 18 May 2023 09:25:38 +1200
 
diff --git a/live-build/auto/config b/live-build/auto/config
index 4d6c080f..b7bec968 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -1170,22 +1170,15 @@ case $PROJECT:${SUBPROJECT:-} in
 esac
 
 if [ "$PROJECT:${SUBPROJECT:-}" = ubuntu-cpc:minimized ]; then
-	# We install a lxc script that installs the snap when invoked. We don't
-	# want any other snaps to come in without due consideration, so fail the
-	# build if we see such a snap.
-	for snap in `cat config/seeded-snaps`; do
-		case $snap in
-			lxd | lxd=*)
-				;;
-			*)
-				echo "Unexpected seeded snap for ubuntu-cpc:minimized build: $snap"
-				exit 1
-				;;
-		esac
-	done
+	# We install a lxc script that installs the snap when invoked and
+	# don't want any other snaps.
+	if [ -s config/seeded-snaps ]; then
+		echo "Unexpected seeded snaps for ubuntu-cpc:minimized build:"
+		cat config/seeded-snaps
+		exit 1
+	fi
 
-	# Truncate but don't delete to a) prevent any snaps from being seeded,
-	# while at the same time b) triggering initialization of assertions.
+	# Create an empty file to trigger initialization of assertions.
 	truncate --size 0 config/seeded-snaps
 fi