diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2017-11-21 18:02:18 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2017-11-21 18:02:18 +0000 |
| commit | 3103eac6a02b9e541a802fda5559427de5a753b7 (patch) | |
| tree | 954af76edfcf5822750b3016c19a9c226af9ee32 | |
| parent | bf71fe61af655c34ade3f8ef731498109b1951bd (diff) | |
| download | src-3103eac6a02b9e541a802fda5559427de5a753b7.tar.gz src-3103eac6a02b9e541a802fda5559427de5a753b7.zip | |
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
Notes
Notes:
svn path=/head/; revision=326068
| -rw-r--r-- | release/tools/ec2.conf | 2 | ||||
| -rw-r--r-- | release/tools/gce.conf | 2 | ||||
| -rw-r--r-- | release/tools/vagrant-virtualbox.conf | 1 | ||||
| -rw-r--r-- | release/tools/vagrant-vmware.conf | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index 4331edc7e00c..e688b6a3d9ff 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -90,5 +90,7 @@ vm_extra_pre_umount() { # * firstboot_pkgs (install packages) touch ${DESTDIR}/firstboot + rm -f ${DESTDIR}/etc/resolv.conf + return 0 } diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 0d7dc841a6b9..7c6f77e45d94 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -92,5 +92,7 @@ EOF touch ${DESTDIR}/firstboot + rm -f ${DESTDIR}/etc/resolv.conf + return 0 } diff --git a/release/tools/vagrant-virtualbox.conf b/release/tools/vagrant-virtualbox.conf index 772068befd30..c29d5716bac2 100644 --- a/release/tools/vagrant-virtualbox.conf +++ b/release/tools/vagrant-virtualbox.conf @@ -15,4 +15,5 @@ vm_extra_pre_umount () { # Setup the Vagrant common items vagrant_common + rm -f ${DESTDIR}/etc/resolv.conf } diff --git a/release/tools/vagrant-vmware.conf b/release/tools/vagrant-vmware.conf index 330892bc7b85..4e0f02c0e76c 100644 --- a/release/tools/vagrant-vmware.conf +++ b/release/tools/vagrant-vmware.conf @@ -19,4 +19,5 @@ vm_extra_pre_umount () { # Setup the Vagrant common items vagrant_common + rm -f ${DESTDIR}/etc/resolv.conf } |