Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-04-27 02:51:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename function to be shorter

Browse Source
This commit is contained in:
Pat Viafore 2020-05-11 12:24:35 -05:00
parent 32d5afc40a
commit 78ced6b26e
No known key found for this signature in database
GPG Key ID: 20C739856E05C9D1
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -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 <patrick.viafore@canonical.com> Mon, 21 Sep 2020 12:08:11 -0500
livecd-rootfs (2.688) groovy; urgency=medium livecd-rootfs (2.688) groovy; urgency=medium
* ubuntu-cpc: Fix spelling in vagrant file * ubuntu-cpc: Fix spelling in vagrant file

4
live-build/functions
View File

@ -87,7 +87,7 @@ mount_image() {
return 0 return 0
} }
setup_sourceslist_to_use_lb_parent_mirror_chroot(){ use_lp_archives_in_sourceslist(){
# Use the build environment apt mirror during the build, # Use the build environment apt mirror during the build,
# for both archive and security. # for both archive and security.
# live-build does this in the chroot (lb_chroot_archives) # live-build does this in the chroot (lb_chroot_archives)
@ -145,7 +145,7 @@ setup_mountpoint() {
cp /etc/resolv.conf "$mountpoint/etc/resolv.conf" cp /etc/resolv.conf "$mountpoint/etc/resolv.conf"
mv "$mountpoint/etc/nsswitch.conf" nsswitch.conf.tmp mv "$mountpoint/etc/nsswitch.conf" nsswitch.conf.tmp
sed 's/systemd//g' nsswitch.conf.tmp > "$mountpoint/etc/nsswitch.conf" 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 chroot "$mountpoint" apt-get update
} }