From owner-svn-src-head@freebsd.org  Tue Sep 26 21:54:20 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B437DE23122;
 Tue, 26 Sep 2017 21:54:20 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 83A5A7C57F;
 Tue, 26 Sep 2017 21:54:20 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8QLsJvK072447;
 Tue, 26 Sep 2017 21:54:19 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8QLsJYa072446;
 Tue, 26 Sep 2017 21:54:19 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201709262154.v8QLsJYa072446@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 26 Sep 2017 21:54:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324033 - head/tools/tools/nanobsd
X-SVN-Group: head
X-SVN-Commit-Author: glebius
X-SVN-Commit-Paths: head/tools/tools/nanobsd
X-SVN-Commit-Revision: 324033
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Sep 2017 21:54:20 -0000

Author: glebius
Date: Tue Sep 26 21:54:19 2017
New Revision: 324033
URL: https://svnweb.freebsd.org/changeset/base/324033

Log:
  Fix regression from r323855.  The EXIT trap now isn't cleared, so upon
  exit it tried to unmount already unmounted partition, resulting in failure.

Modified:
  head/tools/tools/nanobsd/legacy.sh

Modified: head/tools/tools/nanobsd/legacy.sh
==============================================================================
--- head/tools/tools/nanobsd/legacy.sh	Tue Sep 26 21:18:43 2017	(r324032)
+++ head/tools/tools/nanobsd/legacy.sh	Tue Sep 26 21:54:19 2017	(r324033)
@@ -197,7 +197,7 @@ create_diskimage ( ) (
 	fi
 	mdconfig -d -u $MD
 
-	trap - 1 2 15
+	trap - 1 2 15 EXIT
 
 	) > ${NANO_LOG}/_.di 2>&1
 )