From 1aa8b9d882b44e1237b556f552f7c979740a5f95 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 17 Aug 2018 10:09:57 +1200 Subject: [PATCH] ffs --- debian/changelog | 4 ++-- live-build/auto/config | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index aa7c804b..83ba3237 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ -livecd-rootfs (2.535~ppa1) cosmic; urgency=medium +livecd-rootfs (2.535~ppa2) cosmic; urgency=medium * Set PREINSTALLED=true for live-server so that universe ends up being - enabled in the image. + enabled in the image. But make sure PREINSTALLED_POOL_SEEDS is not set. -- Michael Hudson-Doyle Thu, 16 Aug 2018 21:28:00 +1200 diff --git a/live-build/auto/config b/live-build/auto/config index 5ea1f6fe..c4b67e5b 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -495,9 +495,11 @@ case $PROJECT in amd64) add_package live linux-signed-generic ;; esac ;; + *) + PREINSTALL_POOL_SEEDS='server-ship' + ;; esac COMPONENTS='main' - PREINSTALL_POOL_SEEDS='server-ship' ;; ubuntu-core) @@ -695,6 +697,10 @@ export APT_OPTIONS if [ "$PREINSTALLED" != "true" ] && [ "$LIVE_TASK" ]; then add_task live "$LIVE_TASK" fi +if [ -n "$LIVE_TASK" ] && [ "$PROJECT:${SUBPROJECT:-}" = "ubuntu-server:live" ]; then + add_task live "$LIVE_TASK" +fi + case $PROJECT in ubuntu-dvd)