diff --git a/debian/changelog b/debian/changelog index 54346c47..06c89050 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.689) UNRELEASED; urgency=medium + + [ Patrick Viafore ] + * Replace archive.ubuntu.com and security.ubuntu.com with launchpad + mirrors. This is only done inside a build context, and the original + sources.list file is restored at the end of the build + + -- Patrick Viafore Mon, 21 Sep 2020 12:08:11 -0500 + livecd-rootfs (2.688) groovy; urgency=medium * ubuntu-cpc: Fix spelling in vagrant file diff --git a/live-build/functions b/live-build/functions index 46a80108..aebeaa55 100644 --- a/live-build/functions +++ b/live-build/functions @@ -87,7 +87,7 @@ mount_image() { return 0 } -setup_sourceslist_to_use_lb_parent_mirror_chroot(){ +use_lp_archives_in_sourceslist(){ # Use the build environment apt mirror during the build, # for both archive and security. # live-build does this in the chroot (lb_chroot_archives) @@ -145,7 +145,7 @@ setup_mountpoint() { cp /etc/resolv.conf "$mountpoint/etc/resolv.conf" mv "$mountpoint/etc/nsswitch.conf" nsswitch.conf.tmp sed 's/systemd//g' nsswitch.conf.tmp > "$mountpoint/etc/nsswitch.conf" - setup_sourceslist_to_use_lb_parent_mirror_chroot "${mountpoint}" + use_lp_archives_in_sourceslist "${mountpoint}" chroot "$mountpoint" apt-get update }