From 53825b8d5ba4b74a647ddb0c0212c7b336445fbf Mon Sep 17 00:00:00 2001
From: Jason King <jasonbking@users.noreply.github.com>
Date: Mon, 23 Mar 2020 17:51:19 -0500
Subject: OS-8142 A failed pool import triggers EDAR unlock failure (#271)

Reviewed by: Rob Johnston <rob.johnston@joyent.com>
Approved by: Rob Johnston <rob.johnston@joyent.com>
---
 usr/src/cmd/svc/milestone/fs-joyent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/src/cmd/svc/milestone/fs-joyent b/usr/src/cmd/svc/milestone/fs-joyent
index f8b4ffb53d..0a9dc065a3 100755
--- a/usr/src/cmd/svc/milestone/fs-joyent
+++ b/usr/src/cmd/svc/milestone/fs-joyent
@@ -104,7 +104,7 @@ if [ $? -ne 0 ]; then
     fi
 
     for pool in $pools; do
-        zpool import -f $pool
+        zpool import -f $pool || continue
 
         is_encr="$(zfs get -Hpo value encryption $pool)"
 
-- 
cgit v1.2.3