Date: Fri, 14 Apr 2017 17:43:52 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r316879 - vendor/illumos/dist/man/man1m Message-ID: <201704141743.v3EHhqIt052306@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Fri Apr 14 17:43:51 2017 New Revision: 316879 URL: https://svnweb.freebsd.org/changeset/base/316879 Log: missing zfs.1m changes from r286704 Modified: vendor/illumos/dist/man/man1m/zfs.1m Modified: vendor/illumos/dist/man/man1m/zfs.1m ============================================================================== --- vendor/illumos/dist/man/man1m/zfs.1m Fri Apr 14 17:38:43 2017 (r316878) +++ vendor/illumos/dist/man/man1m/zfs.1m Fri Apr 14 17:43:51 2017 (r316879) @@ -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 a 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704141743.v3EHhqIt052306>