From d2dadbecc0ef9ac9fe351e65f7eea27a7cc70e50 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 10 Sep 2012 09:34:56 +0100 Subject: [PATCH] Import patches-unapplied version 2.85 to ubuntu/quantal Imported using git-ubuntu import. Changelog parent: c257ebba9e05d42ebec8316c4a8929d3b963fca2 New changelog entries: * live-build/auto/config: Set KERNEL_FLAVOURS=none for ubuntu-server as well, so that live-build/auto/build doesn't try to copy out kernel images. --- debian/changelog | 8 ++++++++ live-build/auto/config | 1 + 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 49e4a978..04bf84c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.85) quantal; urgency=low + + * live-build/auto/config: Set KERNEL_FLAVOURS=none for ubuntu-server as + well, so that live-build/auto/build doesn't try to copy out kernel + images. + + -- Colin Watson Mon, 10 Sep 2012 09:34:56 +0100 + livecd-rootfs (2.84) quantal; urgency=low * Actually apply the change done in 2.74 as it was only done to the diff --git a/live-build/auto/config b/live-build/auto/config index ac47d05d..31fd7305 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -232,6 +232,7 @@ case $PROJECT in ubuntu-server) add_task install minimal OPTS="${OPTS:+$OPTS }--linux-packages=none" + KERNEL_FLAVOURS=none COMPONENTS='main' PREINSTALL_POOL_SEEDS='server-ship' ;;