Don't fail to build CPC images if /lib/modules already exists in the

squashfs.
ubuntu/cosmic
Daniel Watkins 7 years ago
parent 4c7dea98aa
commit 87c11b5114

7
debian/changelog vendored

@ -1,3 +1,10 @@
livecd-rootfs (2.525) bionic; urgency=medium
* Don't fail to build CPC images if /lib/modules already exists in the
squashfs.
-- Daniel Watkins <daniel.watkins@canonical.com> Tue, 24 Apr 2018 12:00:55 -0400
livecd-rootfs (2.524) bionic; urgency=medium livecd-rootfs (2.524) bionic; urgency=medium
* Ensure MAAS squashfsi are clean of passwords. LP: #1764991. * Ensure MAAS squashfsi are clean of passwords. LP: #1764991.

@ -32,7 +32,7 @@ env DEBIAN_FRONTEND=noninteractive chroot binary/boot/squashfs.dir apt-get --pur
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 --purge remove --assume-yes '^grub-.*'
env DEBIAN_FRONTEND=noninteractive chroot binary/boot/squashfs.dir apt-get autoremove --purge --assume-yes env DEBIAN_FRONTEND=noninteractive chroot binary/boot/squashfs.dir apt-get autoremove --purge --assume-yes
rm -rf binary/boot/squashfs.dir/boot/grub rm -rf binary/boot/squashfs.dir/boot/grub
chroot binary/boot/squashfs.dir mkdir /lib/modules chroot binary/boot/squashfs.dir mkdir -p /lib/modules
chroot binary/boot/squashfs.dir rm /usr/sbin/grub-probe chroot binary/boot/squashfs.dir rm /usr/sbin/grub-probe
chroot binary/boot/squashfs.dir dpkg-divert --remove --local --rename /usr/sbin/grub-probe chroot binary/boot/squashfs.dir dpkg-divert --remove --local --rename /usr/sbin/grub-probe

Loading…
Cancel
Save