ubuntu-cpc: Handle a pre-existing /lib/modules in 030-root-tarball.hook (LP: #1797170).

This commit is contained in:
Daniel Watkins 2018-10-10 09:09:19 -07:00 committed by Steve Langasek
parent 11a9a25fbb
commit 64e90c0cca
2 changed files with 8 additions and 1 deletions

7
debian/changelog vendored
View File

@ -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 <oddbloke@ubuntu.com> 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

View File

@ -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