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@5ff8cfa92e MFC after: 2 weeks
This commit is contained in:
commit
44ec48bc55
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=287770
@ -31,7 +31,7 @@
|
|||||||
.\"
|
.\"
|
||||||
.\" $FreeBSD$
|
.\" $FreeBSD$
|
||||||
.\"
|
.\"
|
||||||
.Dd July 30, 2015
|
.Dd September 14, 2015
|
||||||
.Dt ZFS 8
|
.Dt ZFS 8
|
||||||
.Os
|
.Os
|
||||||
.Sh NAME
|
.Sh NAME
|
||||||
@ -2144,7 +2144,8 @@ Property name
|
|||||||
.It value
|
.It value
|
||||||
Property value
|
Property value
|
||||||
.It source
|
.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
|
.El
|
||||||
.Pp
|
.Pp
|
||||||
@ -2210,8 +2211,11 @@ The default value is all sources.
|
|||||||
.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns ...
|
.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns ...
|
||||||
.Xc
|
.Xc
|
||||||
.Pp
|
.Pp
|
||||||
Clears the specified property, causing it to be inherited from an ancestor. If
|
Clears the specified property, causing it to be inherited from an ancestor,
|
||||||
no ancestor has the property set, then the default value is used. See the
|
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
|
.Qq Sx Properties
|
||||||
section for a listing of default values, and details on which properties can be
|
section for a listing of default values, and details on which properties can be
|
||||||
inherited.
|
inherited.
|
||||||
@ -2219,8 +2223,10 @@ inherited.
|
|||||||
.It Fl r
|
.It Fl r
|
||||||
Recursively inherit the given property for all children.
|
Recursively inherit the given property for all children.
|
||||||
.It Fl S
|
.It Fl S
|
||||||
For properties with a received value, revert to this value. This flag has no
|
Revert the property to the received value if one exists; otherwise operate as
|
||||||
effect on properties that do not have a received value.
|
if the
|
||||||
|
.Fl S
|
||||||
|
option was not specified.
|
||||||
.El
|
.El
|
||||||
.It Xo
|
.It Xo
|
||||||
.Nm
|
.Nm
|
||||||
|
@ -1928,9 +1928,13 @@ zfs_do_inherit(int argc, char **argv)
|
|||||||
if (prop == ZFS_PROP_QUOTA ||
|
if (prop == ZFS_PROP_QUOTA ||
|
||||||
prop == ZFS_PROP_RESERVATION ||
|
prop == ZFS_PROP_RESERVATION ||
|
||||||
prop == ZFS_PROP_REFQUOTA ||
|
prop == ZFS_PROP_REFQUOTA ||
|
||||||
prop == ZFS_PROP_REFRESERVATION)
|
prop == ZFS_PROP_REFRESERVATION) {
|
||||||
(void) fprintf(stderr, gettext("use 'zfs set "
|
(void) fprintf(stderr, gettext("use 'zfs set "
|
||||||
"%s=none' to clear\n"), propname);
|
"%s=none' to clear\n"), propname);
|
||||||
|
(void) fprintf(stderr, gettext("use 'zfs "
|
||||||
|
"inherit -S %s' to revert to received "
|
||||||
|
"value\n"), propname);
|
||||||
|
}
|
||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
if (received && (prop == ZFS_PROP_VOLSIZE ||
|
if (received && (prop == ZFS_PROP_VOLSIZE ||
|
||||||
|
Loading…
Reference in New Issue
Block a user