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

Improving modularity of moving around /etc/resolv.conf in order to make

Browse Source 
some other fixes more future proof.
This commit is contained in:
Cody Shepherd 2018-10-31 11:52:20 -07:00
parent 0ae8b1fc0e
commit 29324714c0
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 mountmpoint=${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() {