From owner-svn-src-projects@FreeBSD.ORG  Tue Oct 14 12:13:44 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 EE61A68A;
 Tue, 14 Oct 2014 12:13:44 +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 DB4E2352;
 Tue, 14 Oct 2014 12:13:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9ECDiha098940;
 Tue, 14 Oct 2014 12:13:44 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9ECDiET098938;
 Tue, 14 Oct 2014 12:13:44 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201410141213.s9ECDiET098938@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: Tue, 14 Oct 2014 12:13:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r273079 - in projects/release-vmimage/release: amd64 i386
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: Tue, 14 Oct 2014 12:13:45 -0000

Author: gjb
Date: Tue Oct 14 12:13:43 2014
New Revision: 273079
URL: https://svnweb.freebsd.org/changeset/base/273079

Log:
  Fix signal list to trigger umount(8).
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-vmimage/release/amd64/mk-azure.sh
  projects/release-vmimage/release/i386/mk-azure.sh

Modified: projects/release-vmimage/release/amd64/mk-azure.sh
==============================================================================
--- projects/release-vmimage/release/amd64/mk-azure.sh	Tue Oct 14 12:13:01 2014	(r273078)
+++ projects/release-vmimage/release/amd64/mk-azure.sh	Tue Oct 14 12:13:43 2014	(r273079)
@@ -67,7 +67,7 @@ vm_create_azure() {
 			usage
 	fi
 
-	trap "umount ${DESTDIR}/dev ${DESTDIR}" EXIT
+	trap "umount ${DESTDIR}/dev ${DESTDIR}" INT QUIT TRAP ABRT TERM
 
 	i=0
 	mkdir -p ${DESTDIR}

Modified: projects/release-vmimage/release/i386/mk-azure.sh
==============================================================================
--- projects/release-vmimage/release/i386/mk-azure.sh	Tue Oct 14 12:13:01 2014	(r273078)
+++ projects/release-vmimage/release/i386/mk-azure.sh	Tue Oct 14 12:13:43 2014	(r273079)
@@ -67,7 +67,7 @@ vm_create_azure() {
 			usage
 	fi
 
-	trap "umount ${DESTDIR}/dev ${DESTDIR}" EXIT
+	trap "umount ${DESTDIR}/dev ${DESTDIR}" INT QUIT TRAP ABRT TERM
 
 	i=0
 	mkdir -p ${DESTDIR}