From ad78957f0103d23ec4f88ad27beb4a0eebe7c279 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 13 Oct 2017 14:20:50 -0400 Subject: [PATCH] Remove boot/grub leftovers from our root squashfs, left behind after grub purge. --- debian/changelog | 7 +++++++ live-build/ubuntu-cpc/hooks/032-root-squashfs.binary | 1 + 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index eedeb482..ef6a347d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.477) UNRELEASED; urgency=medium + + * Remove boot/grub leftovers from our root squashfs, left behind after + grub purge. + + -- Steve Langasek Fri, 13 Oct 2017 14:18:45 -0400 + livecd-rootfs (2.476) artful; urgency=medium * snap.subiquity.started.service must be RemainAfterExit=yes to satisfy diff --git a/live-build/ubuntu-cpc/hooks/032-root-squashfs.binary b/live-build/ubuntu-cpc/hooks/032-root-squashfs.binary index bcce0a76..6c2d6ac8 100755 --- a/live-build/ubuntu-cpc/hooks/032-root-squashfs.binary +++ b/live-build/ubuntu-cpc/hooks/032-root-squashfs.binary @@ -31,6 +31,7 @@ chroot binary/boot/squashfs.dir chmod +x /usr/sbin/grub-probe env DEBIAN_FRONTEND=noninteractive chroot binary/boot/squashfs.dir apt-get --purge remove --assume-yes '^linux-.*' 'linux-base+' env DEBIAN_FRONTEND=noninteractive chroot binary/boot/squashfs.dir apt-get --purge remove --assume-yes '^grub-.*' env DEBIAN_FRONTEND=noninteractive chroot binary/boot/squashfs.dir apt-get autoremove --purge --assume-yes +rm -rf binary/boot/squashfs.dir/boot/grub chroot binary/boot/squashfs.dir mkdir /lib/modules chroot binary/boot/squashfs.dir rm /usr/sbin/grub-probe