svn commit: r212091 - stable/8/etc/periodic/daily

[Alexander Leidinger]

Author: netchild
Date: Wed Sep  1 11:11:20 2010
New Revision: 212091
URL: http://svn.freebsd.org/changeset/base/212091

Log:
  MFC r211800:
    - 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>

Modified:
  stable/8/etc/periodic/daily/800.scrub-zfs   (contents, props changed)
Directory Properties:
  stable/8/etc/periodic/daily/   (props changed)

Modified: stable/8/etc/periodic/daily/800.scrub-zfs
==============================================================================
--- stable/8/etc/periodic/daily/800.scrub-zfs	Wed Sep  1 10:50:58 2010	(r212090)
+++ stable/8/etc/periodic/daily/800.scrub-zfs	Wed Sep  1 11:11:20 2010	(r212091)
@@ -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