summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr/src/cmd/zfs/zfs_main.c2
-rw-r--r--usr/src/cmd/zpool/zpool_main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/cmd/zfs/zfs_main.c b/usr/src/cmd/zfs/zfs_main.c
index 73b818abd4..5cc470162b 100644
--- a/usr/src/cmd/zfs/zfs_main.c
+++ b/usr/src/cmd/zfs/zfs_main.c
@@ -1469,7 +1469,7 @@ zfs_do_list(int argc, char **argv)
zfs_free_proplist(cb.cb_proplist);
zfs_free_sort_columns(sortcol);
- if (ret == 0 && cb.cb_first)
+ if (ret == 0 && cb.cb_first && !cb.cb_scripted)
(void) printf(gettext("no datasets available\n"));
return (ret);
diff --git a/usr/src/cmd/zpool/zpool_main.c b/usr/src/cmd/zpool/zpool_main.c
index fbb4558f92..209e76d64b 100644
--- a/usr/src/cmd/zpool/zpool_main.c
+++ b/usr/src/cmd/zpool/zpool_main.c
@@ -2082,7 +2082,7 @@ zpool_do_list(int argc, char **argv)
ret = for_each_pool(argc, argv, B_TRUE, NULL, list_callback, &cb);
- if (argc == 0 && cb.cb_first) {
+ if (argc == 0 && cb.cb_first && !cb.cb_scripted) {
(void) printf(gettext("no pools available\n"));
return (0);
}