diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-11-17 12:00:11 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-11-17 12:00:11 +0000 |
| commit | 275d73b3f371fe2c5b2e67a1c86ef4b5781ac33c (patch) | |
| tree | 9d7d1d59320de0686fa2fbf770be55d114ee628d /usr/src/man | |
| parent | d3ca33877d23e01eff12715a6c2466f5340f622d (diff) | |
| parent | 68ecb2ec930c4b0f00acaf8e0abb2b19c4b8b76f (diff) | |
| download | illumos-joyent-275d73b3f371fe2c5b2e67a1c86ef4b5781ac33c.tar.gz | |
[illumos-gate merge]
commit 68ecb2ec930c4b0f00acaf8e0abb2b19c4b8b76f
6393 zfs receive a full send as a clone
commit 3d729aecc03ea6ebb9bd5d56b8dccd24f57daa41
6342 want signalfd support
commit f9eb9fdf196b6ed476e4ffc69cecd8b0da3cb7e7
6451 ztest fails due to checksum errors
Conflicts:
usr/src/uts/sparc/Makefile.sparc
usr/src/uts/common/os/sig.c
usr/src/uts/common/io/signalfd.c
Diffstat (limited to 'usr/src/man')
| -rw-r--r-- | usr/src/man/man1m/zfs.1m | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr/src/man/man1m/zfs.1m b/usr/src/man/man1m/zfs.1m index fae4025c40..7300fa6396 100644 --- a/usr/src/man/man1m/zfs.1m +++ b/usr/src/man/man1m/zfs.1m @@ -21,7 +21,7 @@ .\" .\" Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved. .\" Copyright 2011 Joshua M. Clulow <josh@sysmgr.org> -.\" Copyright (c) 2011, 2014 by Delphix. All rights reserved. +.\" Copyright (c) 2011, 2015 by Delphix. All rights reserved. .\" Copyright (c) 2013 by Saso Kiselkov. All rights reserved. .\" Copyright (c) 2015, Joyent, Inc. All rights reserved. .\" Copyright (c) 2014 by Adam Stevko. All rights reserved. @@ -2775,8 +2775,11 @@ Do not actually receive the stream. This can be useful in conjunction with the option to verify the name the receive operation would use. .It Fl o Sy origin Ns = Ns Ar snapshot Forces the stream to be received as a clone of the given snapshot. -This is only valid if the stream is an incremental stream whose source -is the same as the provided origin. +If the stream is a full send stream, this will create the filesystem +described by the stream as a clone of the specified snapshot. Which +snapshot was specified will not affect the success or failure of the +receive, as long as the snapshot does exist. If the stream is an +incremental send stream, all the normal verification will be performed. .It Fl u File system that is associated with the received stream is not mounted. .It Fl v |