From owner-svn-src-projects@FreeBSD.ORG  Wed Nov 19 22:17:23 2014
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 B706C747;
 Wed, 19 Nov 2014 22:17:23 +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 A3902E22;
 Wed, 19 Nov 2014 22:17:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJMHNRJ044919;
 Wed, 19 Nov 2014 22:17:23 GMT (envelope-from cperciva@FreeBSD.org)
Received: (from cperciva@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJMHNbX044918;
 Wed, 19 Nov 2014 22:17:23 GMT (envelope-from cperciva@FreeBSD.org)
Message-Id: <201411192217.sAJMHNbX044918@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: cperciva set sender to
 cperciva@FreeBSD.org using -f
From: Colin Percival <cperciva@FreeBSD.org>
Date: Wed, 19 Nov 2014 22:17:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r274726 - 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: Wed, 19 Nov 2014 22:17:23 -0000

Author: cperciva
Date: Wed Nov 19 22:17:22 2014
New Revision: 274726
URL: https://svnweb.freebsd.org/changeset/base/274726

Log:
  Silence errors when umounting the chroot's /dev, since it probably doesn't
  exist when we're running this.
  
  Unmount filesystems before attempting to destroy the md which holds them.

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

Modified: projects/release-vmimage/release/tools/vmimage.subr
==============================================================================
--- projects/release-vmimage/release/tools/vmimage.subr	Wed Nov 19 20:19:53 2014	(r274725)
+++ projects/release-vmimage/release/tools/vmimage.subr	Wed Nov 19 22:17:22 2014	(r274726)
@@ -42,11 +42,11 @@ err() {
 }
 
 cleanup() {
+	umount ${DESTDIR}/dev 2>/dev/null
+	umount ${DESTDIR}
 	if [ ! -z "${mddev}" ]; then
 		mdconfig -d -u ${mddev}
 	fi
-	umount ${DESTDIR}/dev
-	umount ${DESTDIR}
 
 	return 0
 }