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

Use build env archive mirror in binary hooks

Browse Source
This commit is contained in:
Robert C Jennings 2020-03-05 09:20:36 +01:00 committed by Pat Viafore
parent 76f9f34177
commit 5362e3a7e7
No known key found for this signature in database
GPG Key ID: 20C739856E05C9D1
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
live-build/functions
View File

@ -87,6 +87,25 @@ mount_image() {
return 0
}
setup_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)
# but not for the binary hooks
. config/bootstrap # For the LB_MIRROR_* variables
cp -a "${mountpoint}/etc/apt/sources.list" sources.list.tmp
sed -i "s#http://archive.ubuntu.com/ubuntu#${LB_PARENT_MIRROR_CHROOT}#g" \
"${mountpoint}/etc/apt/sources.list"
sed -i "s#http://security.ubuntu.com/ubuntu#${LB_PARENT_MIRROR_CHROOT}#g" \
"${mountpoint}/etc/apt/sources.list"
}
recover_sourceslist(){
# Remove the build environment apt mirror from the image
mv sources.list.tmp "${mountpoint}/etc/apt/sources.list"
}
setup_mountpoint() {
local mountpoint="$1"
@ -109,6 +128,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 "${mountpoint}"
chroot "$mountpoint" apt-get update
}
@ -125,6 +145,7 @@ teardown_mountpoint() {
mount --make-private $submount
umount $submount
done
recover_sourceslist "${mountpoint}"
mv resolv.conf.tmp "$mountpoint/etc/resolv.conf"
mv nsswitch.conf.tmp "$mountpoint/etc/nsswitch.conf"
}