From 2f1602a7d1ef3a46b55c2e0aaf384ed7883ef30b Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 8 Feb 2012 00:08:21 +0000
Subject: [PATCH] Add an option to 404.status-zfs (enabled by default) to list
 all zfs pools on the system.

While here, document daily_status_zfs_enable in periodic.conf(5).

Discussed on:	-fs [1]
Reviewed by:	netchild [1]
Approved by:	jhb
MFC after:	1 week

[1] - http://lists.freebsd.org/pipermail/freebsd-fs/2011-June/011869.html
---
 etc/defaults/periodic.conf        |  1 +
 etc/periodic/daily/404.status-zfs | 17 +++++++++++++----
 share/man/man5/periodic.conf.5    | 24 +++++++++++++++++++++++-
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf
index 27192bc039e3..66fbcd37322f 100644
--- a/etc/defaults/periodic.conf
+++ b/etc/defaults/periodic.conf
@@ -96,6 +96,7 @@ daily_status_disks_df_flags="-l -h"		# df(1) flags for check
 
 # 404.status-zfs
 daily_status_zfs_enable="NO"				# Check ZFS
+daily_status_zfs_zpool_list_enable="YES"		# List ZFS pools
 
 # 405.status-ata_raid
 daily_status_ata_raid_enable="NO"			# Check ATA raid status
diff --git a/etc/periodic/daily/404.status-zfs b/etc/periodic/daily/404.status-zfs
index 81cc3e4bbb38..df23bae7a37e 100755
--- a/etc/periodic/daily/404.status-zfs
+++ b/etc/periodic/daily/404.status-zfs
@@ -16,12 +16,21 @@ case "$daily_status_zfs_enable" in
 	echo
 	echo 'Checking status of zfs pools:'
 
-	out=`zpool status -x`
-	echo "$out"
+	case "$daily_status_zfs_zpool_list_enable" in
+	    [Yy][Ee][Ss])
+		lout=`zpool list`
+		echo "$lout"
+		echo
+		;;
+	    *)
+		;;
+	esac
+	sout=`zpool status -x`
+	echo "$sout"
 	# zpool status -x always exits with 0, so we have to interpret its
 	# output to see what's going on.
-	if [ "$out" = "all pools are healthy" \
-	    -o "$out" = "no pools available" ]; then
+	if [ "$sout" = "all pools are healthy" \
+	    -o "$sout" = "no pools available" ]; then
 		rc=0
 	else
 		rc=1
diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5
index 540ef2e0cd93..4ab009c18a98 100644
--- a/share/man/man5/periodic.conf.5
+++ b/share/man/man5/periodic.conf.5
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 8, 2011
+.Dd February 7, 2012
 .Dt PERIODIC.CONF 5
 .Os
 .Sh NAME
@@ -335,6 +335,28 @@ utility when
 .Va daily_status_disks_enable
 is set to
 .Dq Li YES .
+.It Va daily_status_zfs_enable
+.Pq Vt bool
+Set to
+.Dq Li YES
+if you want to run
+.Nm zpool Cm status
+on your
+.Xr zfs 8
+pools.
+.It Va daily_status_zfs_zpool_list_enable
+.Pq Vt bool
+Set to
+.Dq Li YES
+if you want to run
+.Nm zpool Cm list
+on your
+.Xr zfs 8
+pools.
+Requires
+.Va daily_status_zfs_enable
+to be set to
+.Li YES .
 .It Va daily_status_ata_raid_enable
 .Pq Vt bool
 Set to