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

Expose a variable for sources.list backup

Browse Source 
MOUNTPOINT_BACKUP_SOURCE_LIST is exposed when you call
setup_mountpoint.  Consumers can use this variable if they need to
explicitly change something in sources.list wihout relying on the name
livecd-rootfs chooses.
This commit is contained in:
Pat Viafore 2020-04-08 12:30:45 -05:00
parent 5190aff932
commit 32d5afc40a
No known key found for this signature in database
GPG Key ID: 20C739856E05C9D1
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
live-build/functions
View File

@ -87,14 +87,19 @@ mount_image() {
return 0 return 0
} }
setup_sourceslist(){ setup_sourceslist_to_use_lb_parent_mirror_chroot(){
# 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)
# but not for the binary hooks # but not for the binary hooks
#
# To restore the sourceslist back to the original, call
# recover_sourceslist
mountpoint="${1}"
MOUNTPOINT_BACKUP_SOURCES_LIST="sources.list.tmp"
. config/bootstrap # For the LB_MIRROR_* variables . config/bootstrap # For the LB_MIRROR_* variables
cp -a "${mountpoint}/etc/apt/sources.list" sources.list.tmp cp -a "${mountpoint}/etc/apt/sources.list" "${MOUNTPOINT_BACKUP_SOURCES_LIST}"
sed -i "s#http://archive.ubuntu.com/ubuntu#${LB_PARENT_MIRROR_CHROOT}#g" \ sed -i "s#http://archive.ubuntu.com/ubuntu#${LB_PARENT_MIRROR_CHROOT}#g" \
"${mountpoint}/etc/apt/sources.list" "${mountpoint}/etc/apt/sources.list"
sed -i "s#http://security.ubuntu.com/ubuntu#${LB_PARENT_MIRROR_CHROOT}#g" \ sed -i "s#http://security.ubuntu.com/ubuntu#${LB_PARENT_MIRROR_CHROOT}#g" \
@ -110,9 +115,12 @@ recover_sourceslist(){
# binary hook has modified the file that will be discarded. If the build # binary hook has modified the file that will be discarded. If the build
# fails here the binary hook needs to alter sources.list.tmp and regenerate # fails here the binary hook needs to alter sources.list.tmp and regenerate
# sources.list.sha # sources.list.sha
mountpoint="${1}"
sha256sum --check sources.list.sha sha256sum --check sources.list.sha
mv sources.list.tmp "${mountpoint}/etc/apt/sources.list" mv "${MOUNTPOINT_BACKUP_SOURCES_LIST}" "${mountpoint}/etc/apt/sources.list"
unset MOUNTPOINT_BACKUP_SOURCES_LIST
} }
setup_mountpoint() { setup_mountpoint() {
@ -137,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 "${mountpoint}" setup_sourceslist_to_use_lb_parent_mirror_chroot "${mountpoint}"
chroot "$mountpoint" apt-get update chroot "$mountpoint" apt-get update
} }