From fe76613e69a4242f4829f51176e4b73e0588702e Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel.watkins@canonical.com>
Date: Wed, 18 Apr 2018 20:00:43 -0400
Subject: [PATCH] Require brand:model to be passed to snap_prepare_assertions

We only need the default in one place, so remove it from all but the top-level
function.
---
 live-build/functions | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/live-build/functions b/live-build/functions
index acf2da90..b1a33d2d 100644
--- a/live-build/functions
+++ b/live-build/functions
@@ -415,9 +415,9 @@ EOF
 snap_prepare_assertions() {
     # Configure basic snapd assertions
     local CHROOT_ROOT=$1
-    # Optional. If set, should be a colon-separated string of brand:model to be
-    # used for the image's model assertion
-    local CUSTOM_BRAND_MODEL=${2:-generic:generic-classic}
+    # A colon-separated string of brand:model to be used for the image's model
+    # assertion
+    local CUSTOM_BRAND_MODEL=$2
 
     local seed_dir="$CHROOT_ROOT/var/lib/snapd/seed"
     local snaps_dir="$seed_dir/snaps"