diff options
| author | delphij <delphij@FreeBSD.org> | 2015-09-14 06:00:50 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2015-09-14 06:00:50 +0000 |
| commit | 0187024b8d77afba20232aa7a8c895a30fd13cd2 (patch) | |
| tree | d41463479cdb2c4542c4e81c24660db7f91f4d2b /cddl/contrib | |
| parent | c1d4644cbc1efd41f962e4979caf367c93d3c5f0 (diff) | |
| download | FreeBSD-src-0187024b8d77afba20232aa7a8c895a30fd13cd2.zip FreeBSD-src-0187024b8d77afba20232aa7a8c895a30fd13cd2.tar.gz | |
MFV r277429:
Document -S option when zfs inherit fails on quota and
in manual pages.
Illumos ZFS issues:
5410 Document -S option to zfs inherit
https://illumos.org/issues/5410
5412 Mention -S option when zfs inherit fails on quota
https://illumos.org/issues/5412
illumos/illumos-gate@5ff8cfa92ec8ea0f8593ad21aa2a04829b0ef5ea
MFC after: 2 weeks
Diffstat (limited to 'cddl/contrib')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/zfs/zfs.8 | 18 | ||||
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/zfs/zfs_main.c | 6 |
2 files changed, 17 insertions, 7 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs.8 b/cddl/contrib/opensolaris/cmd/zfs/zfs.8 index 4da6d0b..e534ae9 100644 --- a/cddl/contrib/opensolaris/cmd/zfs/zfs.8 +++ b/cddl/contrib/opensolaris/cmd/zfs/zfs.8 @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 30, 2015 +.Dd September 14, 2015 .Dt ZFS 8 .Os .Sh NAME @@ -2144,7 +2144,8 @@ Property name .It value Property value .It source -Property source. Can either be local, default, temporary, inherited, or none +Property source. Can either be local, default, temporary, inherited, received, +or none (\&-). .El .Pp @@ -2210,8 +2211,11 @@ The default value is all sources. .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns ... .Xc .Pp -Clears the specified property, causing it to be inherited from an ancestor. If -no ancestor has the property set, then the default value is used. See the +Clears the specified property, causing it to be inherited from an ancestor, +restored to default if no ancestor has the property set, or with the +.Fl S +option reverted to the received value if one exists. +See the .Qq Sx Properties section for a listing of default values, and details on which properties can be inherited. @@ -2219,8 +2223,10 @@ inherited. .It Fl r Recursively inherit the given property for all children. .It Fl S -For properties with a received value, revert to this value. This flag has no -effect on properties that do not have a received value. +Revert the property to the received value if one exists; otherwise operate as +if the +.Fl S +option was not specified. .El .It Xo .Nm diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c index 9d80b9b..9ea178e 100644 --- a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c +++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c @@ -1928,9 +1928,13 @@ zfs_do_inherit(int argc, char **argv) if (prop == ZFS_PROP_QUOTA || prop == ZFS_PROP_RESERVATION || prop == ZFS_PROP_REFQUOTA || - prop == ZFS_PROP_REFRESERVATION) + prop == ZFS_PROP_REFRESERVATION) { (void) fprintf(stderr, gettext("use 'zfs set " "%s=none' to clear\n"), propname); + (void) fprintf(stderr, gettext("use 'zfs " + "inherit -S %s' to revert to received " + "value\n"), propname); + } return (1); } if (received && (prop == ZFS_PROP_VOLSIZE || |
