diff -Nru livecd-rootfs-2.664.1/debian/changelog livecd-rootfs-2.664.2/debian/changelog --- livecd-rootfs-2.664.1/debian/changelog 2020-05-01 20:08:23.000000000 +0100 +++ livecd-rootfs-2.664.2/debian/changelog 2020-05-22 13:03:20.000000000 +0100 @@ -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 -Nru livecd-rootfs-2.664.1/live-build/ubuntu-cpc/hooks.d/base/kvm-image.binary livecd-rootfs-2.664.2/live-build/ubuntu-cpc/hooks.d/base/kvm-image.binary --- livecd-rootfs-2.664.1/live-build/ubuntu-cpc/hooks.d/base/kvm-image.binary 2020-03-30 17:46:08.000000000 +0100 +++ livecd-rootfs-2.664.2/live-build/ubuntu-cpc/hooks.d/base/kvm-image.binary 2020-05-22 13:03:20.000000000 +0100 @@ -49,10 +49,6 @@ 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 diff -Nru livecd-rootfs-2.664.1/patches/lp-1880170-kvm-revert-of-initramfs-package-removal.patch livecd-rootfs-2.664.2/patches/lp-1880170-kvm-revert-of-initramfs-package-removal.patch --- livecd-rootfs-2.664.1/patches/lp-1880170-kvm-revert-of-initramfs-package-removal.patch 1970-01-01 01:00:00.000000000 +0100 +++ livecd-rootfs-2.664.2/patches/lp-1880170-kvm-revert-of-initramfs-package-removal.patch 2020-05-22 13:03:20.000000000 +0100 @@ -0,0 +1,40 @@ +From: Phil Roche +Date: Fri, 22 May 2020 17:33:07 +0100 +Subject: Revert of initramfs package removal in KVM image + +Description: +No packages marked for auto-removal should be present in +a published cloud image. + +The current kvm binary hook in livecd-rootfs removes the +packages `initramfs-tools` and `busybox-initramfs`. This +results in many packages being marked for auto-removal. +These packages are still required in the image and should not +be marked for auto-removal. + +The removal of initramfs-tools and busybox-initramfs was to avoid the +generation of initramfs in images that should boot initramfsless. + +This requirement is obsolete now because the initramfsless boot handling +is now handled via setting GRUB_FORCE_PARTUUID in +/etc/default/grub.d/40-force-partuuid.cfg. + +Author: Phil Roche +Bug-Ubuntu: https://launchpad.net/bugs/1880170 + + +Index: livecd-rootfs-2.664.1/live-build/ubuntu-cpc/hooks.d/base/kvm-image.binary +=================================================================== +--- livecd-rootfs-2.664.1.orig/live-build/ubuntu-cpc/hooks.d/base/kvm-image.binary ++++ livecd-rootfs-2.664.1/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 + diff -Nru livecd-rootfs-2.664.1/patches/series livecd-rootfs-2.664.2/patches/series --- livecd-rootfs-2.664.1/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ livecd-rootfs-2.664.2/patches/series 2020-05-22 13:03:20.000000000 +0100 @@ -0,0 +1 @@ +lp-1880170-kvm-revert-of-initramfs-package-removal.patch