summaryrefslogtreecommitdiff
path: root/usr/src/cmd
diff options
context:
space:
mode:
authorPaul B. Henson <henson@acm.org>2014-12-31 17:44:52 -0800
committerRichard Lowe <richlowe@richlowe.net>2015-01-06 18:29:55 -0500
commit5ff8cfa92ec8ea0f8593ad21aa2a04829b0ef5ea (patch)
tree0d97f21d5047e6ee6002abf92cee423761b713a8 /usr/src/cmd
parentbc9014e6a81272073b9854d9f65dd59e18d18c35 (diff)
downloadillumos-gate-5ff8cfa92ec8ea0f8593ad21aa2a04829b0ef5ea.tar.gz
5410 Document -S option to zfs inherit
5412 Mention -S option when zfs inherit fails on quota Reviewed by: Matthew Ahrens <mahrens@delphix.com> Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/cmd')
-rw-r--r--usr/src/cmd/zfs/zfs_main.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/usr/src/cmd/zfs/zfs_main.c b/usr/src/cmd/zfs/zfs_main.c
index 109a2cf109..5037325e9b 100644
--- a/usr/src/cmd/zfs/zfs_main.c
+++ b/usr/src/cmd/zfs/zfs_main.c
@@ -1890,9 +1890,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 ||