Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-06-03 06:01:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Require brand:model to be passed to snap_prepare_assertions

Browse Source 
We only need the default in one place, so remove it from all but the top-level
function.
This commit is contained in:
Daniel Watkins 2018-04-18 20:00:43 -04:00
parent 38518507ec
commit fe76613e69
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
live-build/functions
View File

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