Merge lp:~oddbloke/livecd-rootfs/custom-model-assertions into lp:livecd-rootfs

[Dan Watkins]

[Dan Watkins (oddbloke)]

I've tested building cloud images with this, and can confirm that this allows custom model assertions to be injected.

[Steve Langasek (vorlon)]

review: Needs Fixing

[lp:~oddbloke/livecd-rootfs/custom-model-assertions]

1669. By Dan Watkins on 2018-04-19

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.

1670. By Dan Watkins on 2018-04-19

Remove necessarily true conditional

[Robert C Jennings (rcj)]

+1

review: Approve

[Dan Watkins (oddbloke)]

Addressed Steve's comments and confirmed the new code works with another image build.

[Steve Langasek (vorlon)]

LGTM.

review: Approve

[lp:~oddbloke/livecd-rootfs/custom-model-assertions]

1671. By Dan Watkins on 2018-04-19

Add changelog entry

=== modified file 'debian/changelog'
--- debian/changelog	2018-04-17 20:53:04 +0000
+++ debian/changelog	2018-04-19 15:47:40 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 livecd-rootfs (2.522) bionic; urgency=medium
 
   * Remove landscape-common from minimal image, and handle restoring it in
@@ -5,6 +6,18 @@
 
  -- Steve Langasek <[e-mail]>  Tue, 17 Apr 2018 13:53:00 -0700
 
+=======
+livecd-rootfs (2.522) bionic; urgency=medium
+
+  * Allow the configuration of model assertions independent of preseeding
+    snaps.
+  * Allow non-generic model assertions to be configured.
+  * Don't include the name of the model assertion in the path we write it out
+    to (LP: #1764541).
+
+ -- Daniel Watkins <[e-mail]>  Thu, 19 Apr 2018 11:44:38 -0400
+
+>>>>>>> MERGE-SOURCE
 livecd-rootfs (2.521) bionic; urgency=medium
 
   * In subiquity image, mount additional squashfs in /media.

=== modified file 'live-build/functions'
--- live-build/functions	2018-04-10 21:33:22 +0000
+++ live-build/functions	2018-04-19 15:47:40 +0000
@@ -412,23 +412,29 @@
     (cd $snaps_dir; ls -1 ${SNAP_NAME}_*.snap) >> $seed_yaml
 }
 
-snap_prepare() {
-    # Configure basic snapd assertions and pre-seeds the 'core' snap
+snap_prepare_assertions() {
+    # Configure basic snapd assertions
     local CHROOT_ROOT=$1
+    # 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"
     local assertions_dir="$seed_dir/assertions"
-    local model_assertion="$assertions_dir/generic-classic.model"
-    local account_key_assertion="$assertions_dir/generic.account-key"
-    local account_assertion="$assertions_dir/generic.account"
+    local model_assertion="$assertions_dir/model"
+    local account_key_assertion="$assertions_dir/account-key"
+    local account_assertion="$assertions_dir/account"
 
     mkdir -p "$assertions_dir"
     mkdir -p "$snaps_dir"
 
+    local brand="$(echo $CUSTOM_BRAND_MODEL | cut -d: -f 1)"
+    local model="$(echo $CUSTOM_BRAND_MODEL | cut -d: -f 2)"
+
     if ! [ -e "$model_assertion" ] ; then
         snap known --remote model series=16 \
-            model=generic-classic brand-id=generic \
+            model=$model brand-id=$brand \
             > "$model_assertion"
     fi
 
@@ -446,6 +452,19 @@
         snap known --remote account account-id=$account \
             > "$account_assertion"
     fi
+}
+
+snap_prepare() {
+    # Configure basic snapd assertions and pre-seeds the 'core' snap
+    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}
+
+    local seed_dir="$CHROOT_ROOT/var/lib/snapd/seed"
+    local snaps_dir="$seed_dir/snaps"
+
+    snap_prepare_assertions "$CHROOT_ROOT" "$CUSTOM_BRAND_MODEL"
 
     # Download the core snap
     if ! [ -f $snaps_dir/core_[0-9]*.snap ] ; then