aboutsummaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorAndriy Gapon <avg@FreeBSD.org>2017-04-14 17:43:51 +0000
committerAndriy Gapon <avg@FreeBSD.org>2017-04-14 17:43:51 +0000
commit7ecf4767d4b56e0353b84dc2549851344d954213 (patch)
tree7866bd49c0cb28f0aaae8a5ae95beee844be0941 /man
parentaad99e99a3478cf9aca895a2c669984c3abe27ad (diff)
downloadsrc-7ecf4767d4b56e0353b84dc2549851344d954213.tar.gz
src-7ecf4767d4b56e0353b84dc2549851344d954213.zip
missing zfs.1m changes from r286704
Notes
Notes: svn path=/vendor/illumos/dist/; revision=316879
Diffstat (limited to 'man')
-rw-r--r--man/man1m/zfs.1m8
1 files changed, 8 insertions, 0 deletions
diff --git a/man/man1m/zfs.1m b/man/man1m/zfs.1m
index c8bcf8c9a74e..1e19be84f63e 100644
--- a/man/man1m/zfs.1m
+++ b/man/man1m/zfs.1m
@@ -175,11 +175,13 @@
.Nm
.Cm receive
.Op Fl Fnuv
+.Op Fl o Sy origin Ns = Ns Ar snapshot
.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
.Nm
.Cm receive
.Op Fl Fnuv
.Op Fl d Ns | Ns Fl e
+.Op Fl o Sy origin Ns = Ns Ar snapshot
.Ar filesystem
.Nm
.Cm allow
@@ -2635,12 +2637,14 @@ origin, etc.
.Nm
.Cm receive
.Op Fl Fnuv
+.Op Fl o Sy origin Ns = Ns Ar snapshot
.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
.br
.Nm
.Cm receive
.Op Fl Fnuv
.Op Fl d Ns | Ns Fl e
+.Op Fl o Sy origin Ns = Ns Ar snapshot
.Ar filesystem
.Xc
Creates a snapshot whose contents are as specified in the stream provided on
@@ -2730,6 +2734,10 @@ snapshot as described in the paragraph above.
Do not actually receive the stream. This can be useful in conjunction with the
.Fl v
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.
.It Fl u
File system that is associated with the received stream is not mounted.
.It Fl v