Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 11:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
squashfs.
This commit is contained in:
Daniel Watkins 2018-04-24 12:35:40 -04:00 committed by Mathieu Trudel-Lapierre
commit 10feacf941
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.525) UNRELEASED; 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
* Ensure MAAS squashfsi are clean of passwords. LP: #1764991.

2
live-build/ubuntu-cpc/hooks/032-root-squashfs.binary
View File

@ -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 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 mkdir -p /lib/modules
chroot binary/boot/squashfs.dir rm /usr/sbin/grub-probe
chroot binary/boot/squashfs.dir dpkg-divert --remove --local --rename /usr/sbin/grub-probe