From 083d58397c2c2533c806834477e54301c6574e0a Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sat, 21 Oct 2017 18:51:20 -0700 Subject: [PATCH] Make sure to remove any initramfs that was generated in a minimized image. --- debian/changelog | 2 ++ live-build/auto/build | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 33b74471..64c70a2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ livecd-rootfs (2.479) UNRELEASED; urgency=medium * Purge initramfs-tools from minimized images. + * Make sure to remove any initramfs that was generated in a minimized + image. -- Steve Langasek Fri, 13 Oct 2017 17:14:58 -0400 diff --git a/live-build/auto/build b/live-build/auto/build index 97d7c2b3..e2d9359e 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -217,6 +217,12 @@ EOF Chroot chroot "env DEBIAN_FRONTEND=noninteractive \ apt-get -y purge initramfs-tools busybox-initramfs \ busybox-static" + # 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-* + # temporary workaround: don't remove linux-base which # may have no other reverse-depends currently Chroot chroot "env DEBIAN_FRONTEND=noninteractive \