Author: gjb
Date: Tue Nov 21 18:02:18 2017
New Revision: 326068
URL: https://svnweb.freebsd.org/changeset/base/326068
Log:
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.
Noticed by: peter
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/release/tools/ec2.conf
head/release/tools/gce.conf
head/release/tools/vagrant-virtualbox.conf
head/release/tools/vagrant-vmware.conf
Modified: head/release/tools/ec2.conf
==============================================================================
--- head/release/tools/ec2.conf Tue Nov 21 18:01:43 2017 (r326067)
+++ head/release/tools/ec2.conf Tue Nov 21 18:02:18 2017 (r326068)
@@ -90,5 +90,7 @@ vm_extra_pre_umount() {
# * firstboot_pkgs (install packages)
touch ${DESTDIR}/firstboot
+ rm -f ${DESTDIR}/etc/resolv.conf
+
return 0
}
Modified: head/release/tools/gce.conf
==============================================================================
--- head/release/tools/gce.conf Tue Nov 21 18:01:43 2017 (r326067)
+++ head/release/tools/gce.conf Tue Nov 21 18:02:18 2017 (r326068)
@@ -92,5 +92,7 @@ EOF
touch ${DESTDIR}/firstboot
+ rm -f ${DESTDIR}/etc/resolv.conf
+
return 0
}
Modified: head/release/tools/vagrant-virtualbox.conf
==============================================================================
--- head/release/tools/vagrant-virtualbox.conf Tue Nov 21 18:01:43 2017
(r326067)
+++ head/release/tools/vagrant-virtualbox.conf Tue Nov 21 18:02:18 2017
(r326068)
@@ -15,4 +15,5 @@ vm_extra_pre_umount () {
# Setup the Vagrant common items
vagrant_common
+ rm -f ${DESTDIR}/etc/resolv.conf
}
Modified: head/release/tools/vagrant-vmware.conf
==============================================================================
--- head/release/tools/vagrant-vmware.conf Tue Nov 21 18:01:43 2017
(r326067)
+++ head/release/tools/vagrant-vmware.conf Tue Nov 21 18:02:18 2017
(r326068)
@@ -19,4 +19,5 @@ vm_extra_pre_umount () {
# Setup the Vagrant common items
vagrant_common
+ rm -f ${DESTDIR}/etc/resolv.conf
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
