From owner-svn-src-stable-10@FreeBSD.ORG  Thu Apr 30 00:34:42 2015
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3BD6E602;
 Thu, 30 Apr 2015 00:34:42 +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 298081E0E;
 Thu, 30 Apr 2015 00:34:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3U0YgtE042324;
 Thu, 30 Apr 2015 00:34:42 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3U0YgHq042323;
 Thu, 30 Apr 2015 00:34:42 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201504300034.t3U0YgHq042323@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: Thu, 30 Apr 2015 00:34:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r282262 - stable/10/release/tools
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Apr 2015 00:34:42 -0000

Author: gjb
Date: Thu Apr 30 00:34:41 2015
New Revision: 282262
URL: https://svnweb.freebsd.org/changeset/base/282262

Log:
  MFC r282112:
    Fix a comment.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/tools/vmimage.subr
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/tools/vmimage.subr
==============================================================================
--- stable/10/release/tools/vmimage.subr	Thu Apr 30 00:27:53 2015	(r282261)
+++ stable/10/release/tools/vmimage.subr	Thu Apr 30 00:34:41 2015	(r282262)
@@ -175,8 +175,10 @@ vm_extra_install_ports() {
 }
 
 vm_extra_pre_umount() {
-	# Prototype.  When overridden, installs additional ports within the
-	# virtual machine environment.
+	# Prototype.  When overridden, performs additional tasks within the
+	# virtual machine environment prior to unmounting the filesystem.
+	# Note: When overriding this function, removing resolv.conf in the
+	# disk image must be included.
 
 	rm -f ${DESTDIR}/etc/resolv.conf
 	return 0