diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-11-15 12:18:34 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-11-15 12:18:34 +0000 |
commit | 0014059c42c8416c5989ff40d38f7e914e5985cf (patch) | |
tree | 7d51dbfd9dae1be593412ec8ac3a69a1f18337f7 /usr/src | |
parent | 01e5b2318bd46ccafc1634fa45623f5dcccfc412 (diff) | |
parent | 9185393f2919d8b897f6142d8a9fa0429c285dc1 (diff) | |
download | illumos-joyent-0014059c42c8416c5989ff40d38f7e914e5985cf.tar.gz |
[illumos-gate merge]
commit 9185393f2919d8b897f6142d8a9fa0429c285dc1
6412 zfs receive: -u can be ignored sometimes
Diffstat (limited to 'usr/src')
-rw-r--r-- | usr/src/lib/libzfs/common/libzfs_sendrecv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_sendrecv.c b/usr/src/lib/libzfs/common/libzfs_sendrecv.c index cf204d706e..eab6d4bacb 100644 --- a/usr/src/lib/libzfs/common/libzfs_sendrecv.c +++ b/usr/src/lib/libzfs/common/libzfs_sendrecv.c @@ -3533,7 +3533,8 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap, } if (clp) { - err |= changelist_postfix(clp); + if (!flags->nomount) + err |= changelist_postfix(clp); changelist_free(clp); } |