ffs

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 <mwhudson@debian.org>  Thu, 16 Aug 2018 21:28:00 +1200
 

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)