From owner-svn-src-projects@FreeBSD.ORG  Mon Nov 24 02:34:02 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@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 90A04B50;
 Mon, 24 Nov 2014 02:34:02 +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 7E1FB942;
 Mon, 24 Nov 2014 02:34:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAO2Y24N041269;
 Mon, 24 Nov 2014 02:34:02 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAO2Y2Sx041268;
 Mon, 24 Nov 2014 02:34:02 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201411240234.sAO2Y2Sx041268@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, 24 Nov 2014 02:34:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r274945 - 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, 24 Nov 2014 02:34:02 -0000

Author: gjb
Date: Mon Nov 24 02:34:01 2014
New Revision: 274945
URL: https://svnweb.freebsd.org/changeset/base/274945

Log:
  In vm_extra_install_packages(), only bootstrap pkg(8)
  if VM_EXTRA_PACKAGES is empty.
  
  In vm_extra_pre_umount(), cleanup downloaded packages
  if pkg(8) was bootstrapped earlier.
  
  Inspired by:	cperciva
  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 Nov 24 01:59:08 2014	(r274944)
+++ projects/release-vmimage/release/tools/vmimage.subr	Mon Nov 24 02:34:01 2014	(r274945)
@@ -114,14 +114,15 @@ vm_extra_enable_services() {
 }
 
 vm_extra_install_packages() {
+	if [ -z "${VM_EXTRA_PACKAGES}" ]; then
+		return 0
+	fi
 	mkdir -p ${DESTDIR}/dev
 	mount -t devfs devfs ${DESTDIR}/dev
 	chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \
 		/usr/sbin/pkg bootstrap -y
-	if [ ! -z "${VM_EXTRA_PACKAGES}" ]; then
 		chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \
 			/usr/sbin/pkg install -y ${VM_EXTRA_PACKAGES}
-	fi
 	umount ${DESTDIR}/dev
 
 	return 0
@@ -138,6 +139,10 @@ vm_extra_pre_umount() {
 	# Prototype.  When overridden, installs additional ports within the
 	# virtual machine environment.
 
+	if [ -e ${DESTDIR}/usr/local/sbin/pkg ]; then
+		chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \
+			/usr/local/sbin/pkg clean -y -a
+	fi
 	rm -f ${DESTDIR}/etc/resolv.conf
 
 	return 0