diff options
| author | Jason King <jasonbking@users.noreply.github.com> | 2020-03-23 17:51:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-23 17:51:19 -0500 |
| commit | 53825b8d5ba4b74a647ddb0c0212c7b336445fbf (patch) | |
| tree | c9b2fa92a0433ce8683a49c888b718baa20ff485 | |
| parent | da036f5cbc2608d7100a682f9c91a938e76cefdc (diff) | |
| download | illumos-joyent-53825b8d5ba4b74a647ddb0c0212c7b336445fbf.tar.gz | |
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>
| -rwxr-xr-x | usr/src/cmd/svc/milestone/fs-joyent | 2 |
1 files changed, 1 insertions, 1 deletions
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)" |