From 119bdf3b3abd18520e44ebdd3b64496bf84e2747 Mon Sep 17 00:00:00 2001
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 26 Sep 2017 21:54:19 +0000
Subject: [PATCH] Fix regression from r323855.  The EXIT trap now isn't
 cleared, so upon exit it tried to unmount already unmounted partition,
 resulting in failure.

---
 tools/tools/nanobsd/legacy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/tools/nanobsd/legacy.sh b/tools/tools/nanobsd/legacy.sh
index 7b21329f7a7..0ae8290b75f 100644
--- a/tools/tools/nanobsd/legacy.sh
+++ b/tools/tools/nanobsd/legacy.sh
@@ -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
 )