From owner-svn-src-stable-8@FreeBSD.ORG  Wed Sep  1 11:11:20 2010
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8EC1510656B5;
	Wed,  1 Sep 2010 11:11:20 +0000 (UTC)
	(envelope-from netchild@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7C3A58FC1D;
	Wed,  1 Sep 2010 11:11:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o81BBKNj062036;
	Wed, 1 Sep 2010 11:11:20 GMT (envelope-from netchild@svn.freebsd.org)
Received: (from netchild@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o81BBK53062034;
	Wed, 1 Sep 2010 11:11:20 GMT (envelope-from netchild@svn.freebsd.org)
Message-Id: <201009011111.o81BBK53062034@svn.freebsd.org>
From: Alexander Leidinger <netchild@FreeBSD.org>
Date: Wed, 1 Sep 2010 11:11:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212091 - stable/8/etc/periodic/daily
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Sep 2010 11:11:20 -0000

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@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