diff options
author | Paul B. Henson <[email protected]> | 2014-12-31 17:44:52 -0800 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2015-04-24 15:16:49 -0700 |
commit | 0bf8501ae1f7c995d54c6061d8da29419ec4fed0 (patch) | |
tree | a8b17a37eac23cf46a27794de9b69d203096a457 /cmd | |
parent | 4eb30c68644c0aacbed9e10d94eff071b2cd76f8 (diff) |
5410 Document -S option to zfs inherit
5410 Document -S option to zfs inherit
5412 Mention -S option when zfs inherit fails on quota
Reviewed by: Matthew Ahrens <[email protected]>
Approved by: Richard Lowe <[email protected]>
References:
https://www.illumos.org/issues/5410
https://github.com/illumos/illumos-gate/commit/5ff8cfa9
Ported-by: DHE <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #3279
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/zfs/zfs_main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c index 84073435e..5b469cfc7 100644 --- a/cmd/zfs/zfs_main.c +++ b/cmd/zfs/zfs_main.c @@ -1903,9 +1903,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 || |