diff --git a/debian/changelog b/debian/changelog index 198275bf..53b0cc19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,20 @@ livecd-rootfs (2.442) UNRELEASED; urgency=medium -- Steve Langasek Thu, 13 Apr 2017 10:38:04 -0700 +livecd-rootfs (2.441.2) zesty; urgency=medium + + * The ubuntu-server:live should use a casper-based initramfs to work + correctly. (LP: #1682460) + + -- Mathieu Trudel-Lapierre Tue, 18 Apr 2017 09:56:31 -0400 + +livecd-rootfs (2.441.1) zesty; urgency=medium + + * Setup kernel properly for ubuntu-server:live; we *do* want to build + kernel-generic and initrd-generic for this image. (LP: #1682460) + + -- Mathieu Trudel-Lapierre Thu, 13 Apr 2017 11:14:09 -0400 + livecd-rootfs (2.441) zesty; urgency=medium [ Balint Reczey ] diff --git a/live-build/auto/config b/live-build/auto/config index 2f8decec..34937680 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -137,14 +137,17 @@ case $IMAGEFORMAT in ;; plain) - OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT" + INITRAMFS_TYPE=none case $PROJECT:$SUBPROJECT in ubuntu-server:live) + add_package live lupin-casper + INITRAMFS_TYPE=auto ;; *) PREINSTALLED=true ;; esac + OPTS="${OPTS:+$OPTS }--initramfs $INITRAMFS_TYPE --chroot-filesystem $IMAGEFORMAT" ;; ubuntu-image) @@ -618,8 +621,10 @@ case $ARCH in ;; esac -case $PROJECT in - ubuntu-server|ubuntu-base|ubuntu-touch|ubuntu-touch-custom) +case $PROJECT:$SUBPROJECT in + ubuntu-server:live) + ;; + ubuntu-server:*|ubuntu-base:*|ubuntu-touch:*|ubuntu-touch-custom:*) OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" KERNEL_FLAVOURS=none BINARY_REMOVE_LINUX=false