From b7e6aee81b7d2d49f36bc4ad179b3b05f3d08d7a Mon Sep 17 00:00:00 2001
From: Iain Lane <iain.lane@canonical.com>
Date: Mon, 15 Jul 2019 16:11:48 +0100
Subject: [PATCH] live-build/functions: Seed core again on non-minimized builds

This is apparently still required; without it snapd gives an error
message like:

  stateengine.go:102: state ensure error: devicemgr: cannot proceed without seeding "core"

(cherry picked from commit 7f07cc899192b33c0eded30ffa514a6581df046e)
---
 live-build/functions | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/live-build/functions b/live-build/functions
index a010ba0a..a8a73b1f 100644
--- a/live-build/functions
+++ b/live-build/functions
@@ -619,6 +619,12 @@ snap_prepare() {
     local CUSTOM_BRAND_MODEL=${2:-generic:generic-classic}
 
     snap_prepare_assertions "$CHROOT_ROOT" "$CUSTOM_BRAND_MODEL"
+
+    # ubuntu-cpc:minimized has its own special snap handling
+    if [ "$PROJECT:${SUBPROJECT:-}" != ubuntu-cpc:minimized ]; then
+        # Download the core snap
+        _snap_preseed "$CHROOT_ROOT" core stable
+    fi
 }
 
 snap_preseed() {