summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2012-02-08 00:08:21 +0000
committergjb <gjb@FreeBSD.org>2012-02-08 00:08:21 +0000
commit3120fac2c967ea9e896b260f9f7cea65c3278899 (patch)
tree918939d8e80c9c9a8137f6a3e134129bc7df60c5 /etc
parentc02e62efd7ee044f7de028259dc67578d9568cad (diff)
downloadFreeBSD-src-3120fac2c967ea9e896b260f9f7cea65c3278899.zip
FreeBSD-src-3120fac2c967ea9e896b260f9f7cea65c3278899.tar.gz
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
Diffstat (limited to 'etc')
-rw-r--r--etc/defaults/periodic.conf1
-rwxr-xr-xetc/periodic/daily/404.status-zfs17
2 files changed, 14 insertions, 4 deletions
diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf
index 27192bc..66fbcd3 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 81cc3e4..df23bae 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
OpenPOWER on IntegriCloud