From owner-svn-src-head@freebsd.org Tue Nov 21 18:02:19 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E9C4BDF566D; Tue, 21 Nov 2017 18:02:19 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9C1767879C; Tue, 21 Nov 2017 18:02:19 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vALI2IDR095969; Tue, 21 Nov 2017 18:02:18 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vALI2IVt095318; Tue, 21 Nov 2017 18:02:18 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201711211802.vALI2IVt095318@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 21 Nov 2017 18:02:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326068 - head/release/tools X-SVN-Group: head X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: head/release/tools X-SVN-Commit-Revision: 326068 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Nov 2017 18:02:20 -0000 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 }