In vm_install_base(), copy the host resolv.conf into

the build chroot before attempting to do anything that
requires working DNS (i.e., pkg bootstrap).

In vm_extra_pre_umount(), remove the resolv.conf before
the disk image is unmounted from the backing md(4).

Reported by:	cperciva
Sponsored by:	The FreeBSD Foundation

3 files changed, 8 insertions, 0 deletions

diff --git a/release/tools/azure.conf b/release/tools/azure.conf
index 16c207da3240..3e4a4864adfe 100644
--- a/release/tools/azure.conf
+++ b/release/tools/azure.conf
@@ -33,6 +33,8 @@ vm_extra_pre_umount() {
 	echo 'console="comconsole vidconsole"' >> ${DESTDIR}/boot/loader.conf
 	echo 'comconsole_speed="115200"' >> ${DESTDIR}/boot/loader.conf
 
+	rm -f ${DESTDIR}/etc/resolv.conf
+
 	return 0
 }
 
diff --git a/release/tools/openstack.conf b/release/tools/openstack.conf
index 6aa17493f974..3e0e857e9d89 100644
--- a/release/tools/openstack.conf
+++ b/release/tools/openstack.conf
@@ -22,5 +22,7 @@ vm_extra_pre_umount() {
 	echo 'sshd_enable="YES"' >> ${DESTDIR}/etc/rc.conf
 	echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf
 
+	rm -f ${DESTDIR}/etc/resolv.conf
+
 	return 0
 }
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index bc2a7fb1f50f..00a0a2e23da3 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -85,6 +85,8 @@ vm_install_base() {
 	chroot ${DESTDIR} /etc/rc.d/ldconfig forcestart
 	umount ${DESTDIR}/dev
 
+	cp /etc/resolv.conf ${DESTDIR}/etc/resolv.conf
+
 	return 0
 }
 
@@ -131,6 +133,8 @@ vm_extra_pre_umount() {
 	# Prototype.  When overridden, installs additional ports within the
 	# virtual machine environment.
 
+	rm -f ${DESTDIR}/etc/resolv.conf
+
 	return 0
 }