diff --git a/debian/changelog b/debian/changelog index 743c746a..20b80a61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.408.22) UNRELEASED; urgency=medium + + * Make sure to remove any initramfs that was generated in a minimized + image. + + -- Steve Langasek Sat, 21 Oct 2017 20:52:38 -0700 + livecd-rootfs (2.408.21) xenial; urgency=medium [ Balint Reczey ] diff --git a/live-build/auto/build b/live-build/auto/build index 367e41f8..8f4b0bd5 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -158,6 +158,14 @@ EOF lb chroot "$@" + if [ "${SUBPROJECT:-}" = minimized ]; then + # and if initramfs-tools was configured before our kernel, + # /etc/kernel/postinst.d/initramfs-tools will have created + # an initramfs despite the generic dpkg-divert; so remove it + # here. + rm -f chroot/boot/initrd.img-* + fi + if [ -f config/oem-config-preinstalled ]; then # This is cargo-culted almost verbatim (with some syntax changes for