svn commit: r231721 - in stable/9: etc/defaults etc/periodic/daily share/man/man5

[Glen Barber]

Author: gjb (doc committer)
Date: Wed Feb 15 01:52:59 2012
New Revision: 231721
URL: http://svn.freebsd.org/changeset/base/231721

Log:
  MFC r231171:
   -  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).
  
  Approved by:	jhb

Modified:
  stable/9/etc/defaults/periodic.conf
  stable/9/etc/periodic/daily/404.status-zfs
  stable/9/share/man/man5/periodic.conf.5
Directory Properties:
  stable/9/etc/   (props changed)
  stable/9/share/man/man5/   (props changed)

Modified: stable/9/etc/defaults/periodic.conf
==============================================================================
--- stable/9/etc/defaults/periodic.conf	Wed Feb 15 01:41:00 2012	(r231720)
+++ stable/9/etc/defaults/periodic.conf	Wed Feb 15 01:52:59 2012	(r231721)
@@ -96,6 +96,7 @@ daily_status_disks_df_flags="-l -h"		# d
 
 # 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

Modified: stable/9/etc/periodic/daily/404.status-zfs
==============================================================================
--- stable/9/etc/periodic/daily/404.status-zfs	Wed Feb 15 01:41:00 2012	(r231720)
+++ stable/9/etc/periodic/daily/404.status-zfs	Wed Feb 15 01:52:59 2012	(r231721)
@@ -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

Modified: stable/9/share/man/man5/periodic.conf.5
==============================================================================
--- stable/9/share/man/man5/periodic.conf.5	Wed Feb 15 01:41:00 2012	(r231720)
+++ stable/9/share/man/man5/periodic.conf.5	Wed Feb 15 01:52:59 2012	(r231721)
@@ -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