diff --git a/debian/changelog b/debian/changelog index 8a7104dd..57fe6ee4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.505~ppa3) bionic; urgency=medium +livecd-rootfs (2.505~ppa4) bionic; urgency=medium * Move casper from filesystem.squashfs to installer.squashfs. diff --git a/live-build/functions b/live-build/functions index 09edef12..c31d306f 100644 --- a/live-build/functions +++ b/live-build/functions @@ -338,28 +338,11 @@ recreate_initramfs() { # tweaking... CHROOT="$1" # Start by cargo culting bits of lb_chroot_hacks: + if [ -n "$LB_INITRAMFS_COMPRESSION" ]; then + echo "COMPRESS=$LB_INITRAMFS_COMPRESSION" > "$CHROOT"/etc/initramfs-tools/conf.d/livecd-rootfs.conf + fi chroot "$CHROOT" sh -c "${UPDATE_INITRAMFS_OPTIONS:-} update-initramfs -k all -t -u" - case "${LB_INITRAMFS_COMPRESSION}" in - gzip) - ;; - - bzip2) - for INITRAMFS in $(find "$CHROOT"/boot -name 'initrd*' -not -type l); do - zcat "${INITRAMFS}" | bzip2 -c ${BZIP2_OPTIONS} > "${INITRAMFS}.new" - mv "${INITRAMFS}.new" "${INITRAMFS}" - done - ;; - - lzma) - # We probably ought to use COMPRESS= in a temporary file in - # /etc/initramfs-tools/conf.d/ instead, but it's hard to - # pass options that way. - for INITRAMFS in $(find "$CHROOT"/boot -name 'initrd*' -not -type l); do - zcat "${INITRAMFS}" | lzma -c ${LZMA_OPTIONS} > "${INITRAMFS}.new" - mv "${INITRAMFS}.new" "${INITRAMFS}" - done - ;; - esac + rm -rf "$CHROOT"/etc/initramfs-tools/conf.d/livecd-rootfs.conf # Then bits of lb_binary_linux-image: case "${LB_INITRAMFS}" in casper)