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

Merge lp:~codyshepherd/livecd-rootfs/xenial-proposed-resolvconf

Browse Source
This commit is contained in:
Steve Langasek 2018-11-01 10:11:20 -07:00
commit f292ab1847
2 changed files with 22 additions and 3 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.408.40) UNRELEASED; urgency=medium
[ Cody Shepherd ]
* Increasing modularity in relocation of /etc/resolv.conf to enable users
of live-build/functions to manipulate /etc/resolv.conf in a more
granular and future-proof way.
-- Steve Langasek <steve.langasek@ubuntu.com> Thu, 01 Nov 2018 10:10:12 -0700
livecd-rootfs (2.408.39) xenial; urgency=medium livecd-rootfs (2.408.39) xenial; urgency=medium
* Backport support for building ubuntu-core images with ubuntu-image (using * Backport support for building ubuntu-core images with ubuntu-image (using

16
live-build/functions
View File

@ -77,6 +77,17 @@ mount_image() {
return 0 return 0
} }
setup_resolvconf() {
local mountpoint=${1}
mv "${mountpoint}/etc/resolv.conf" resolv.conf.tmp
cp /etc/resolv.conf "${mountpoint}/etc/resolv.conf"
}
recover_resolvconf() {
local mountpoint=${1}
mv resolv.conf.tmp "${mountpoint}/etc/resolv.conf"
}
setup_mountpoint() { setup_mountpoint() {
local mountpoint="$1" local mountpoint="$1"
@ -86,8 +97,7 @@ setup_mountpoint() {
mount -t tmpfs none "$mountpoint/tmp" mount -t tmpfs none "$mountpoint/tmp"
mount -t tmpfs none "$mountpoint/var/lib/apt" mount -t tmpfs none "$mountpoint/var/lib/apt"
mount -t tmpfs none "$mountpoint/var/cache/apt" mount -t tmpfs none "$mountpoint/var/cache/apt"
mv "$mountpoint/etc/resolv.conf" resolv.conf.tmp setup_resolvconf "${mountpoint}"
cp /etc/resolv.conf "$mountpoint/etc/resolv.conf"
chroot "$mountpoint" apt-get update chroot "$mountpoint" apt-get update
} }
@ -103,7 +113,7 @@ teardown_mountpoint() {
{ print \$2 }" | LC_ALL=C sort -r); do { print \$2 }" | LC_ALL=C sort -r); do
umount $submount umount $submount
done done
mv resolv.conf.tmp "$mountpoint/etc/resolv.conf" recover_resolvconf "${mountpoint}"
} }
mount_partition() { mount_partition() {