diff --git a/live-build/auto/config b/live-build/auto/config index bd5eaca1..e2bcea9b 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -324,13 +324,13 @@ case $PROJECT in ubuntu-core) add_task install minimal - # mvo: This is for cron.daily-preinstalled - # CDIMAGE_PREINSTALLED is not passed from build.py - # and PREINSTALLED means something different. So - # we use SUBPROJECT to pass on the information - if [ "$SUBPROJECT" = "system-image" ]; then - add_task install ubuntu-core - fi + # mvo: This is for cron.daily-preinstalled + # CDIMAGE_PREINSTALLED is not passed from build.py + # and PREINSTALLED means something different. So + # we use SUBPROJECT to pass on the information + if [ "$SUBPROJECT" = "system-image" ]; then + add_task install ubuntu-core + fi OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal" ;; @@ -436,14 +436,14 @@ esac case $PROJECT in ubuntu-server|ubuntu-core|ubuntu-touch) - case $SUBPROJECT in + case $SUBPROJECT in system-image) - # keep the kernel for the system-image build + # keep the kernel for the system-image build ;; *) - OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" - KERNEL_FLAVOURS=none - BINARY_REMOVE_LINUX=false + OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" + KERNEL_FLAVOURS=none + BINARY_REMOVE_LINUX=false ;; esac esac