From 64e90c0cca258ee8120e99f38d93cae9a8ba76e4 Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Wed, 10 Oct 2018 09:09:19 -0700 Subject: [PATCH] ubuntu-cpc: Handle a pre-existing /lib/modules in 030-root-tarball.hook (LP: #1797170). --- debian/changelog | 7 +++++++ live-build/ubuntu-cpc/hooks/030-root-tarball.binary | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d20a448a..16b8d012 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.408.38) xenial; urgency=medium + + * ubuntu-cpc: Handle a pre-existing /lib/modules in 030-root-tarball.hook + (LP: #1797170). + + -- Daniel Watkins Wed, 10 Oct 2018 11:55:30 -0400 + livecd-rootfs (2.408.37) xenial; urgency=medium * debian/dirs: add debian/dirs entry for empty includes.chroot dir diff --git a/live-build/ubuntu-cpc/hooks/030-root-tarball.binary b/live-build/ubuntu-cpc/hooks/030-root-tarball.binary index 30a70d02..e5bdc2c5 100755 --- a/live-build/ubuntu-cpc/hooks/030-root-tarball.binary +++ b/live-build/ubuntu-cpc/hooks/030-root-tarball.binary @@ -19,7 +19,7 @@ chroot binary/boot/filesystem.dir chmod +x /usr/sbin/grub-probe env DEBIAN_FRONTEND=noninteractive chroot binary/boot/filesystem.dir apt-get --purge remove --assume-yes '^linux-.*' 'linux-base+' env DEBIAN_FRONTEND=noninteractive chroot binary/boot/filesystem.dir apt-get --purge remove --assume-yes '^grub-.*' env DEBIAN_FRONTEND=noninteractive chroot binary/boot/filesystem.dir apt-get autoremove --purge --assume-yes -chroot binary/boot/filesystem.dir mkdir /lib/modules +chroot binary/boot/filesystem.dir mkdir -p /lib/modules chroot binary/boot/filesystem.dir rm /usr/sbin/grub-probe chroot binary/boot/filesystem.dir dpkg-divert --remove --local --rename /usr/sbin/grub-probe