diff --git a/debian/changelog b/debian/changelog index 74f475ef..ae987655 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.664.2) focal; urgency=medium + + * Revert of initramfs package removal in KVM image (LP: #1880170) + + -- Phil Roche Fri, 22 May 2020 13:03:20 +0100 + livecd-rootfs (2.664.1) focal; urgency=medium * Bump only the UC20 pc image to 8GB, and keep Pi images as small as possible. diff --git a/live-build/auto/config b/live-build/auto/config index fb6ca877..7ad94ccb 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -360,14 +360,14 @@ case $IMAGEFORMAT in case $MODEL in pc-amd64|pc-i386) if [ -z "${SUBARCH:-}" ]; then - case $SUITE in - xenial|bionic) - UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M" - ;; - *) - UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 8G" - ;; - esac + case $SUITE in + xenial|bionic) + UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M" + ;; + *) + UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 8G" + ;; + esac fi ;; *) ;; diff --git a/live-build/ubuntu-cpc/hooks.d/base/kvm-image.binary b/live-build/ubuntu-cpc/hooks.d/base/kvm-image.binary index 931010bc..094cb375 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/kvm-image.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/kvm-image.binary @@ -49,10 +49,6 @@ replace_kernel ${mount_d} "linux-kvm" chroot "${mount_d}" update-grub undivert_grub "${mount_d}" -# Remove initramfs for kvm image -env DEBIAN_FRONTEND=noninteractive chroot "${mount_d}" apt-get \ - purge -y initramfs-tools busybox-initramfs - env DEBIAN_FRONTEND=noninteractive chroot "${mount_d}" rm \ -rf /boot/initrd.img-* /boot/initrd.img