From owner-svn-src-all@freebsd.org Mon Nov 27 15:12:16 2017 Return-Path: Delivered-To: svn-src-all@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 80B31E5406A; Mon, 27 Nov 2017 15:12:16 +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 48CA475984; Mon, 27 Nov 2017 15:12:16 +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 vARFCFB4099491; Mon, 27 Nov 2017 15:12:15 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARFCFqT098997; Mon, 27 Nov 2017 15:12:15 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201711271512.vARFCFqT098997@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 27 Nov 2017 15:12:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r326264 - in stable: 10/release/tools 11/release/tools X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in stable: 10/release/tools 11/release/tools X-SVN-Commit-Revision: 326264 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Nov 2017 15:12:16 -0000 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/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) Changes in other areas also in this revision: 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) Modified: stable/11/release/tools/ec2.conf ============================================================================== --- stable/11/release/tools/ec2.conf Mon Nov 27 15:11:47 2017 (r326263) +++ stable/11/release/tools/ec2.conf Mon Nov 27 15:12:14 2017 (r326264) @@ -90,5 +90,7 @@ vm_extra_pre_umount() { # * firstboot_pkgs (install packages) touch ${DESTDIR}/firstboot + rm -f ${DESTDIR}/etc/resolv.conf + return 0 } Modified: stable/11/release/tools/gce.conf ============================================================================== --- stable/11/release/tools/gce.conf Mon Nov 27 15:11:47 2017 (r326263) +++ stable/11/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/11/release/tools/vagrant-virtualbox.conf ============================================================================== --- stable/11/release/tools/vagrant-virtualbox.conf Mon Nov 27 15:11:47 2017 (r326263) +++ stable/11/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/11/release/tools/vagrant-vmware.conf ============================================================================== --- stable/11/release/tools/vagrant-vmware.conf Mon Nov 27 15:11:47 2017 (r326263) +++ stable/11/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 }