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

Fix use of unbound variable

Browse Source
This commit is contained in:
Daniel Watkins 2018-04-17 17:35:10 -04:00
parent d908e89a52
commit ed50ee0e0d
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
live-build/functions
View File

@ -417,7 +417,7 @@ snap_prepare_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
local CUSTOM_BRAND_MODEL=${2:-generic:generic-classic}
local seed_dir="$CHROOT_ROOT/var/lib/snapd/seed"
local snaps_dir="$seed_dir/snaps"
@ -429,8 +429,6 @@ snap_prepare_assertions() {
mkdir -p "$assertions_dir"
mkdir -p "$snaps_dir"
local brand="generic"
local model="generic-classic"
if [ -n "$CUSTOM_BRAND_MODEL" ] ; then
brand="$(echo $CUSTOM_BRAND_MODEL | cut -d: -f 1)"
model="$(echo $CUSTOM_BRAND_MODEL | cut -d: -f 2)"