svn commit: r326264 - in stable: 10/release/tools 11/release/tools

[Glen Barber]

Author: gjb
Date: Mon Nov 27 15:12:14 2017
New Revision: 326264
URL: https://svnweb.freebsd.org/changeset/base/326264

Log:
  MFC r326068:
   Remove /etc/resolv.conf from virtual machine images, which is
   copied from the build host.  It is renamed to /etc/resolv.conf.bak
   on boot, so never used anyway.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/tools/ec2.conf
  stable/10/release/tools/gce.conf
  stable/10/release/tools/vagrant-virtualbox.conf
  stable/10/release/tools/vagrant-vmware.conf
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/release/tools/ec2.conf
  stable/11/release/tools/gce.conf
  stable/11/release/tools/vagrant-virtualbox.conf
  stable/11/release/tools/vagrant-vmware.conf
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/release/tools/ec2.conf
==============================================================================
--- stable/10/release/tools/ec2.conf	Mon Nov 27 15:11:47 2017	(r326263)
+++ stable/10/release/tools/ec2.conf	Mon Nov 27 15:12:14 2017	(r326264)
@@ -82,5 +82,7 @@ vm_extra_pre_umount() {
 	# * firstboot_pkgs (install packages)
 	touch ${DESTDIR}/firstboot
 
+	rm -f ${DESTDIR}/etc/resolv.conf
+
 	return 0
 }

Modified: stable/10/release/tools/gce.conf
==============================================================================
--- stable/10/release/tools/gce.conf	Mon Nov 27 15:11:47 2017	(r326263)
+++ stable/10/release/tools/gce.conf	Mon Nov 27 15:12:14 2017	(r326264)
@@ -89,5 +89,7 @@ EOF
 
 	touch ${DESTDIR}/firstboot
 
+	rm -f ${DESTDIR}/etc/resolv.conf
+
 	return 0
 }

Modified: stable/10/release/tools/vagrant-virtualbox.conf
==============================================================================
--- stable/10/release/tools/vagrant-virtualbox.conf	Mon Nov 27 15:11:47 2017	(r326263)
+++ stable/10/release/tools/vagrant-virtualbox.conf	Mon Nov 27 15:12:14 2017	(r326264)
@@ -15,4 +15,5 @@ vm_extra_pre_umount () {
 
 	# Setup the Vagrant common items
 	vagrant_common
+	rm -f ${DESTDIR}/etc/resolv.conf
 }

Modified: stable/10/release/tools/vagrant-vmware.conf
==============================================================================
--- stable/10/release/tools/vagrant-vmware.conf	Mon Nov 27 15:11:47 2017	(r326263)
+++ stable/10/release/tools/vagrant-vmware.conf	Mon Nov 27 15:12:14 2017	(r326264)
@@ -19,4 +19,5 @@ vm_extra_pre_umount () {
 
 	# Setup the Vagrant common items
 	vagrant_common
+	rm -f ${DESTDIR}/etc/resolv.conf
 }