diff options
| author | avg <avg@FreeBSD.org> | 2016-04-03 07:40:33 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2016-04-03 07:40:33 +0000 |
| commit | 6ba2768c8e47103fa98249ad322514fdb95fdb8c (patch) | |
| tree | d0e767d700109a08565b657d59233dcd09d98304 /cddl/contrib/opensolaris | |
| parent | 68ea027ebe5275dda4a21e619eb28159849e2ba8 (diff) | |
| download | FreeBSD-src-6ba2768c8e47103fa98249ad322514fdb95fdb8c.zip FreeBSD-src-6ba2768c8e47103fa98249ad322514fdb95fdb8c.tar.gz | |
zfs receive: -u can be ignored sometimes
When force-receiving a filesystem that was already mounted the re-created
filesystem is mounted despite -u flag.
Also see https://www.illumos.org/issues/6412.
PR: 204705
Tested by: Vladimir Krstulja <vlad-fbsd@acheronmedia.com>
MFC after: 2 weeks
X-Needs-Upstreaming: illumos
Diffstat (limited to 'cddl/contrib/opensolaris')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c index 723cd42..eb9a9dd 100644 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c +++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c @@ -3479,7 +3479,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); } |
