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

[Alexander Leidinger]

Author: netchild
Date: Wed Aug 25 08:09:42 2010
New Revision: 211800
URL: http://svn.freebsd.org/changeset/base/211800

Log:
  - Change the threshold from 'running next scrub the <value+1>th day after the
    last one' to 'running next scrub the <value>th day after the last one'.
  - Improve wording.
  
  Requested by:	jhell <jhell at DataIX.net>
  MFC after:	1 week

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

Modified: head/etc/periodic/daily/800.scrub-zfs
==============================================================================
--- head/etc/periodic/daily/800.scrub-zfs	Wed Aug 25 07:33:35 2010	(r211799)
+++ head/etc/periodic/daily/800.scrub-zfs	Wed Aug 25 08:09:42 2010	(r211800)
@@ -53,7 +53,7 @@ case "$daily_scrub_zfs_enable" in
 		# Now minus last scrub (both in seconds) converted to days.
 		_scrub_diff=$(expr -e \( $(date +%s) - \
 		    $(date -j -f %F.%T ${_last_scrub} +%s) \) / 60 / 60 / 24)
-		if [ ${_scrub_diff} -le ${_pool_threshold} ]; then
+		if [ ${_scrub_diff} -lt ${_pool_threshold} ]; then
 			echo "   skipping scrubbing of pool '${pool}':"
 			echo "      last scrubbing is ${_scrub_diff} days ago, threshold is set to ${_pool_threshold} days"
 			continue
@@ -65,11 +65,11 @@ case "$daily_scrub_zfs_enable" in
 				echo "   scrubbing of pool '${pool}' already in progress, skipping:"
 				;;
 			*"none requested"*)
-				echo "   starting first scrubbing (after reboot) of pool '${pool}':"
+				echo "   starting first scrub (since reboot) of pool '${pool}':"
 				zpool scrub ${pool}
 				;;
 			*)
-				echo "   starting scrubbing of pool '${pool}':"
+				echo "   starting scrub of pool '${pool}':"
 				zpool scrub ${pool}
 				;;
 		esac