Author: mm
Date: Tue Oct 16 19:59:13 2012
New Revision: 241615
URL: http://svn.freebsd.org/changeset/base/241615
Log:
MFC r240955 (partial):
Remove unsupported "-r" option from zfs send.
Illumos issued covered:
2811 missing implementation: zfs send -r
PR: kern/171761
Modified:
stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs.8
stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
Directory Properties:
stable/8/cddl/contrib/opensolaris/ (props changed)
Modified: stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Tue Oct 16 19:58:15
2012 (r241614)
+++ stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Tue Oct 16 19:59:13
2012 (r241615)
@@ -169,7 +169,7 @@
.Fl a | Ar filesystem Ns | Ns Ar mountpoint
.Nm
.Cm send
-.Op Fl DnPpRrv
+.Op Fl DnPpRv
.Op Fl i Ar snapshot | Fl I Ar snapshot
.Ar snapshot
.Nm
@@ -2179,7 +2179,7 @@ file system shared on the system.
.It Xo
.Nm
.Cm send
-.Op Fl DnPpRrv
+.Op Fl DnPpRv
.Op Fl i Ar snapshot | Fl I Ar snapshot
.Ar snapshot
.Xc
@@ -2252,13 +2252,6 @@ be used regardless of the dataset's
property, but performance will be much better if the filesystem uses a
dedup-capable checksum (eg.
.Sy sha256 ) .
-.It Fl r
-Recursively send all descendant snapshots. This is similar to the
-.Fl R
-flag, but information about deleted and renamed datasets is not included, and
-property information is only included if the
-.Fl p
-flag is specified.
.It Fl p
Include the dataset's properties in the stream. This flag is implicit when
.Fl R
Modified: stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Tue Oct 16
19:58:15 2012 (r241614)
+++ stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Tue Oct 16
19:59:13 2012 (r241615)
@@ -267,7 +267,7 @@ get_usage(zfs_help_t idx)
case HELP_ROLLBACK:
return (gettext("\trollback [-rRf] <snapshot>\n"));
case HELP_SEND:
- return (gettext("\tsend [-DnPpRrv] "
+ return (gettext("\tsend [-DnPpRv] "
"[-i snapshot | -I snapshot] <snapshot>\n"));
case HELP_SET:
return (gettext("\tset <property=value> "
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
