diff --git a/debian/changelog b/debian/changelog index 407ab3c2..875ff1d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,11 @@ livecd-rootfs (2.609) UNRELEASED; urgency=medium [ Ethan Hsieh ] * Add support for the Nitrogen6x board (LP: #1838064). - -- Łukasz 'sil2100' Zemczak Thu, 05 Sep 2019 17:29:57 +0200 + [ Łukasz 'sil2100' Zemczak ] + * Do not initialize EXTRA_SNAPS with an empty value. Allow overrides via the + environment. + + -- Łukasz 'sil2100' Zemczak Fri, 06 Sep 2019 12:06:51 +0200 livecd-rootfs (2.608) eoan; urgency=medium diff --git a/live-build/auto/config b/live-build/auto/config index daaff5bc..f20fad8e 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -342,7 +342,6 @@ case $IMAGEFORMAT in if [ $PROJECT = "ubuntu-core" ]; then # snap-based core images - EXTRA_SNAPS="" case $MODEL in pc-amd64|pc-i386) @@ -362,7 +361,7 @@ case $IMAGEFORMAT in case "$ARCH+${SUBARCH:-}" in amd64+kassel) - EXTRA_SNAPS="core bluez alsa-utils" + EXTRA_SNAPS="$EXTRA_SNAPS core bluez alsa-utils" ;; *) ;; esac