Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-21 15:51:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make lzma initramfs compression opt-in rather than opt-out, and do not

Browse Source 
opt-in to it for live-server builds to speed up the boot. (LP: #1750873)
This commit is contained in:
Michael Hudson-Doyle 2018-04-11 19:15:45 +12:00
commit 64ca1acc40
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -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 <michael.hudson@ubuntu.com> Tue, 13 Mar 2018 21:24:27 +1300
livecd-rootfs (2.519) bionic; urgency=medium livecd-rootfs (2.519) bionic; urgency=medium
[ Robert C Jennings ] [ Robert C Jennings ]

10
live-build/auto/config
View File

@ -322,6 +322,12 @@ if ! [ -e config/germinate-output/structure ]; then
${COMPONENTS:+-c "$COMPONENTS"} -a $ARCH) ${COMPONENTS:+-c "$COMPONENTS"} -a $ARCH)
fi 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 case $PROJECT in
ubuntu|ubuntu-dvd) ubuntu|ubuntu-dvd)
add_task install minimal standard ubuntu-desktop add_task install minimal standard ubuntu-desktop
@ -559,7 +565,6 @@ case $PROJECT in
;; ;;
esac esac
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
INITRAMFS_COMPRESSION="none"
# contains the framework definition # contains the framework definition
add_package install ubuntu-core-libs add_package install ubuntu-core-libs
@ -655,7 +660,6 @@ case $PROJECT in
OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs" OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096" OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15" OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
INITRAMFS_COMPRESSION="gzip"
;; ;;
*) *)
@ -823,7 +827,7 @@ lb config noauto \
${KERNEL_FLAVOURS:+--linux-flavours "$KERNEL_FLAVOURS"} \ ${KERNEL_FLAVOURS:+--linux-flavours "$KERNEL_FLAVOURS"} \
--initsystem none \ --initsystem none \
--bootloader "$BOOTLOADER" \ --bootloader "$BOOTLOADER" \
--initramfs-compression "${INITRAMFS_COMPRESSION:-lzma}" \ ${INITRAMFS_COMPRESSION:+--initramfs-compression "$INITRAMFS_COMPRESSION}" \
--cache false \ --cache false \
${BOOTAPPEND_LIVE:+--bootappend-live "$BOOTAPPEND_LIVE"} \ ${BOOTAPPEND_LIVE:+--bootappend-live "$BOOTAPPEND_LIVE"} \
$OPTS \ $OPTS \