From 6658b4ff57da19c65f76802d1593bc52cccde51e Mon Sep 17 00:00:00 2001 From: "Joshua M. Clulow" Date: Fri, 16 Dec 2011 15:38:30 +1100 Subject: [PATCH] 1888 zfs(1M) should mention zfs recv -e Reviewed by: Garrett D'Amore Reviewed by: Eric Schrock Reviewed by: Gordon Ross Approved by: Richard Lowe --- usr/src/man/man1m/zfs.1m | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/usr/src/man/man1m/zfs.1m b/usr/src/man/man1m/zfs.1m index 4c9e09f817..c591ce19bb 100644 --- a/usr/src/man/man1m/zfs.1m +++ b/usr/src/man/man1m/zfs.1m @@ -6,6 +6,7 @@ .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] .\" Copyright 2011 Nexenta Systems, Inc. All rights reserved. .\" Copyright 2011 by Delphix. All rights reserved. +.\" Copyright 2011 Joshua M. Clulow .TH ZFS 1M "28 Jul 2011" .SH NAME zfs \- configures ZFS file systems @@ -153,7 +154,7 @@ zfs \- configures ZFS file systems .LP .nf -\fBzfs\fR \fBreceive\fR [\fB-vnFu\fR] \fB-d\fR \fIfilesystem\fR +\fBzfs\fR \fBreceive\fR [\fB-vnFu\fR] [\fB-d\fR|\fB-e\fR] \fIfilesystem\fR .fi .LP @@ -2850,7 +2851,7 @@ on future versions of \fBZFS\fR. .ad .br .na -\fB\fBzfs receive\fR [\fB-vnFu\fR] \fB-d\fR \fIfilesystem\fR\fR +\fB\fBzfs receive\fR [\fB-vnFu\fR] [\fB-d\fR|\fB-e\fR] \fIfilesystem\fR\fR .ad .sp .6 .RS 4n @@ -2872,15 +2873,23 @@ on the sending location are destroyed by using the \fBzfs destroy\fR \fB-d\fR command. .sp The name of the snapshot (and file system, if a full stream is received) that -this subcommand creates depends on the argument type and the \fB-d\fR option. +this subcommand creates depends on the argument type and the use of the +\fB-d\fR or \fB-e\fR options. .sp If the argument is a snapshot name, the specified \fIsnapshot\fR is created. If the argument is a file system or volume name, a snapshot with the same name as the sent snapshot is created within the specified \fIfilesystem\fR or -\fIvolume\fR. If the \fB-d\fR option is specified, the snapshot name is -determined by appending the sent snapshot's name to the specified -\fIfilesystem\fR. If the \fB-d\fR option is specified, any required file -systems within the specified one are created. +\fIvolume\fR. If neither of the \fB-d\fR or \fB-e\fR options are specified, +the provided target snapshot name is used exactly as provided. +.sp +The \fB-d\fR and \fB-e\fR options cause the file system name of the target +snapshot to be determined by appending a portion of the sent snapshot's name to +the specified target \fIfilesystem\fR. If the \fB-d\fR option is specified, all +but the first element of the sent snapshot's file system path (usually the +pool name) is used and any required intermediate file systems within the +specified one are created. If the \fB-e\fR option is specified, then only the +last element of the sent snapshot's file system name (i.e. the name of the +source file system itself) is used as the target file system name. .sp .ne 2 .na @@ -2888,8 +2897,21 @@ systems within the specified one are created. .ad .sp .6 .RS 4n -Use the name of the sent snapshot to determine the name of the new snapshot as -described in the paragraph above. +Discard the first element of the sent snapshot's file system name, using +the remaining elements to determine the name of the target file system for +the new snapshot as described in the paragraph above. +.RE + +.sp +.ne 2 +.na +\fB\fB-e\fR\fR +.ad +.sp .6 +.RS 4n +Discard all but the last element of the sent snapshot's file system name, +using that element to determine the name of the target file system for +the new snapshot as described in the paragraph above. .RE .sp -- 2.11.4.GIT