Date: Wed, 19 Nov 2014 20:19:53 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274725 - projects/release-vmimage/release/tools Message-ID: <201411192019.sAJKJsCC087424@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Wed Nov 19 20:19:53 2014 New Revision: 274725 URL: https://svnweb.freebsd.org/changeset/base/274725 Log: 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 Modified: projects/release-vmimage/release/tools/azure.conf projects/release-vmimage/release/tools/openstack.conf projects/release-vmimage/release/tools/vmimage.subr Modified: projects/release-vmimage/release/tools/azure.conf ============================================================================== --- projects/release-vmimage/release/tools/azure.conf Wed Nov 19 20:16:56 2014 (r274724) +++ projects/release-vmimage/release/tools/azure.conf Wed Nov 19 20:19:53 2014 (r274725) @@ -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 } Modified: projects/release-vmimage/release/tools/openstack.conf ============================================================================== --- projects/release-vmimage/release/tools/openstack.conf Wed Nov 19 20:16:56 2014 (r274724) +++ projects/release-vmimage/release/tools/openstack.conf Wed Nov 19 20:19:53 2014 (r274725) @@ -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 } Modified: projects/release-vmimage/release/tools/vmimage.subr ============================================================================== --- projects/release-vmimage/release/tools/vmimage.subr Wed Nov 19 20:16:56 2014 (r274724) +++ projects/release-vmimage/release/tools/vmimage.subr Wed Nov 19 20:19:53 2014 (r274725) @@ -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 }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411192019.sAJKJsCC087424>