From owner-svn-src-projects@FreeBSD.ORG  Mon Jan 19 18:36:11 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 91EE53A6;
 Mon, 19 Jan 2015 18:36:11 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 7EE3164C;
 Mon, 19 Jan 2015 18:36:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0JIaBpc073607;
 Mon, 19 Jan 2015 18:36:11 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0JIaBGM073606;
 Mon, 19 Jan 2015 18:36:11 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201501191836.t0JIaBGM073606@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 19 Jan 2015 18:36:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r277394 - projects/release-vmimage/release/tools
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jan 2015 18:36:11 -0000

Author: gjb
Date: Mon Jan 19 18:36:10 2015
New Revision: 277394
URL: https://svnweb.freebsd.org/changeset/base/277394

Log:
  Move resolv.conf(5) removal back to vm_extra_pre_umount()
  where it belongs.
  
  The GCE image needs resolv.conf(5) to exist (created as
  part of the image setup), so it cannot be removed.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-vmimage/release/tools/vmimage.subr

Modified: projects/release-vmimage/release/tools/vmimage.subr
==============================================================================
--- projects/release-vmimage/release/tools/vmimage.subr	Mon Jan 19 18:17:21 2015	(r277393)
+++ projects/release-vmimage/release/tools/vmimage.subr	Mon Jan 19 18:36:10 2015	(r277394)
@@ -146,6 +146,7 @@ vm_extra_pre_umount() {
 	# Prototype.  When overridden, installs additional ports within the
 	# virtual machine environment.
 
+	rm -f ${DESTDIR}/etc/resolv.conf
 	return 0
 }
 
@@ -154,7 +155,6 @@ vm_extra_pkg_rmcache() {
 		chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \
 			/usr/local/sbin/pkg clean -y -a
 	fi
-	rm -f ${DESTDIR}/etc/resolv.conf
 
 	return 0
 }