svn commit: r295329 - head/etc/periodic/daily

[Alexander Motin]

Author: mav
Date: Fri Feb  5 18:17:37 2016
New Revision: 295329
URL: https://svnweb.freebsd.org/changeset/base/295329

Log:
  Update script for modern `zpool status` output.

Modified:
  head/etc/periodic/daily/800.scrub-zfs

Modified: head/etc/periodic/daily/800.scrub-zfs
==============================================================================
--- head/etc/periodic/daily/800.scrub-zfs	Fri Feb  5 18:13:55 2016	(r295328)
+++ head/etc/periodic/daily/800.scrub-zfs	Fri Feb  5 18:17:37 2016	(r295329)
@@ -78,11 +78,14 @@ case "$daily_scrub_zfs_enable" in
 			continue
 		fi
 
-		_status="$(zpool status ${pool} | grep scrub:)"
+		_status="$(zpool status ${pool} | grep scan:)"
 		case "${_status}" in
 			*"scrub in progress"*)
 				echo "   scrubbing of pool '${pool}' already in progress, skipping:"
 				;;
+			*"resilver in progress"*)
+				echo "   resilvering of pool '${pool}' is in progress, skipping:"
+				;;
 			*"none requested"*)
 				echo "   starting first scrub (since reboot) of pool '${pool}':"
 				zpool scrub ${pool}