diff --git a/debian/changelog b/debian/changelog index f96bf01f..432aac61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.520) UNRELEASED; urgency=medium + + * Make lzma initramfs compression opt-in rather than opt-out, and do not + opt-in to it for live-server builds to speed up the boot. (LP: #1750873) + + -- Michael Hudson-Doyle Tue, 13 Mar 2018 21:24:27 +1300 + livecd-rootfs (2.519) bionic; urgency=medium [ Robert C Jennings ] diff --git a/live-build/auto/config b/live-build/auto/config index e21a736d..957100ae 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -322,6 +322,12 @@ if ! [ -e config/germinate-output/structure ]; then ${COMPONENTS:+-c "$COMPONENTS"} -a $ARCH) fi +case $PROJECT in + base|edubuntu|edubuntu-dvd|kubuntu|kubuntu-active|kubuntu-dvd|kubuntu-plasma5|lubuntu|lubuntu-next|mythbuntu|ubuntu|ubuntu-budgie|ubuntu-desktop-next|ubuntu-dvd|ubuntu-gnome|ubuntu-mate|ubuntu-netbook|ubuntukylin|ubuntustudio-dvd|xubuntu) + INITRAMFS_COMPRESSION="lzma" + ;; +esac + case $PROJECT in ubuntu|ubuntu-dvd) add_task install minimal standard ubuntu-desktop @@ -559,7 +565,6 @@ case $PROJECT in ;; esac OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" - INITRAMFS_COMPRESSION="none" # contains the framework definition add_package install ubuntu-core-libs @@ -655,7 +660,6 @@ case $PROJECT in OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs" OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096" OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15" - INITRAMFS_COMPRESSION="gzip" ;; *) @@ -823,7 +827,7 @@ lb config noauto \ ${KERNEL_FLAVOURS:+--linux-flavours "$KERNEL_FLAVOURS"} \ --initsystem none \ --bootloader "$BOOTLOADER" \ - --initramfs-compression "${INITRAMFS_COMPRESSION:-lzma}" \ + ${INITRAMFS_COMPRESSION:+--initramfs-compression "$INITRAMFS_COMPRESSION}" \ --cache false \ ${BOOTAPPEND_LIVE:+--bootappend-live "$BOOTAPPEND_LIVE"} \ $OPTS \