svn commit: r229381 - in stable: 8/etc/defaults 8/etc/periodic/daily 9/etc/defaults 9/etc/periodic/daily

[Xin LI]

Author: delphij
Date: Tue Jan  3 10:22:09 2012
New Revision: 229381
URL: http://svn.freebsd.org/changeset/base/229381

Log:
  MFC r226471 (se):
  
  Add missing default values for daily/800.scrub-zfs for documentation
  purposes. No functional change, since all parameters are set to their
  default values.
  
  MFC r226865 (delphij):
  
  Increase default scrub threshold from 30 days to 5 weeks.  Using
  whole weeks makes it easier to predicate when the scrub would
  happen.
  
  Requested by:	gjb

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

Changes in other areas also in this revision:
Modified:
  stable/9/etc/defaults/periodic.conf
  stable/9/etc/periodic/daily/800.scrub-zfs
Directory Properties:
  stable/9/etc/   (props changed)

Modified: stable/8/etc/defaults/periodic.conf
==============================================================================
--- stable/8/etc/defaults/periodic.conf	Tue Jan  3 10:02:44 2012	(r229380)
+++ stable/8/etc/defaults/periodic.conf	Tue Jan  3 10:22:09 2012	(r229381)
@@ -144,6 +144,12 @@ daily_status_ntpd_enable="NO"				# Check
 daily_queuerun_enable="YES"				# Run mail queue
 daily_submit_queuerun="YES"				# Also submit queue
 
+# 800.scrub-zfs
+daily_scrub_zfs_enable="NO"
+daily_scrub_zfs_pools=""			# empty string selects all pools
+daily_scrub_zfs_default_threshold="35"		# days between scrubs
+#daily_scrub_zfs_${poolname}_threshold="35"	# pool specific threshold
+
 # 999.local
 daily_local="/etc/daily.local"				# Local scripts
 

Modified: stable/8/etc/periodic/daily/800.scrub-zfs
==============================================================================
--- stable/8/etc/periodic/daily/800.scrub-zfs	Tue Jan  3 10:02:44 2012	(r229380)
+++ stable/8/etc/periodic/daily/800.scrub-zfs	Tue Jan  3 10:22:09 2012	(r229381)
@@ -15,7 +15,7 @@ then
     source_periodic_confs
 fi
 
-: ${daily_scrub_zfs_default_threshold=30}
+: ${daily_scrub_zfs_default_threshold=35}
 
 case "$daily_scrub_zfs_enable" in
     [Yy][Ee][Ss])