Merge branch 'cvs' into cvs-merge

[mirror_smartmontools-debian.git] / smartd.conf.5.in

diff --git a/smartd.conf.5.in b/smartd.conf.5.in
index b47d56dd90daa3c7cbff5dcba9c3fdc0a86fa5fa..10e1040c8791018bd74e38f2665b11876f12e528 100644 (file)
--- a/smartd.conf.5.in
+++ b/smartd.conf.5.in
@@ -1,7 +1,7 @@
 .ig
-Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+Copyright (C) 2002-7 Bruce Allen <smartmontools-support@lists.sourceforge.net>
 
-$Id: smartd.conf.5.in,v 1.82 2006/12/20 07:30:43 sxzzsf Exp $
+$Id: smartd.conf.5.in,v 1.86 2007/10/20 13:02:50 chrfranke Exp $
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the Free
@@ -298,10 +298,10 @@ controllers (using the Marvell rather than libata driver).
 
 .I 3ware,N
 \- the device consists of one or more ATA disks connected to a 3ware
-RAID controller. The non-negative integer N (in the range from 0 to 15
+RAID controller. The non-negative integer N (in the range from 0 to 31
 inclusive) denotes which disk on the controller is monitored.  In log
 files and email messages this disk will be identified as 3ware_disk_XX
-with XX in the range from 00 to 15 inclusive.
+with XX in the range from 00 to 31 inclusive.
 
 This Directive may at first appear confusing, because the 3ware
 controller is a SCSI device (such as /dev/sda) and should be listed as
@@ -571,6 +571,10 @@ interrupted to begin another test.
 \fBsmartd\fP will not attempt to run \fBany\fP type of test if another
 test was already started or run in the same hour.
 
+To avoid performance problems during system boot, \fBsmartd\fP will
+not attempt to run any scheduled tests following the very first
+device polling (unless \'\-q onecheck\' is specified).
+
 Each time a test is run, \fBsmartd\fP will log an entry to SYSLOG.
 You can use these or the '-q showtests' command-line option to verify
 that you constructed \fBREGEXP\fP correctly.  The matching order
@@ -729,7 +733,7 @@ is set to the argument of \-M exec, if present or else to \'mail\'
 is set to the device path (examples: /dev/hda, /dev/sdb).
 .IP \fBSMARTD_DEVICETYPE\fP 4
 is set to the device type (possible values: ata, scsi, 3ware,N, hpt,L/M/N).
-Here N=0,...,15 denotes the ATA disk behind a 3ware RAID controller and
+Here N=0,...,23 denotes the ATA disk behind a 3ware RAID controller and
 L/M/N denotes the SATA disk behind a HighPoint RocketRAID controller.
 .IP \fBSMARTD_DEVICESTRING\fP 4
 is set to the device description.  For SMARTD_DEVICETYPE of ata or
@@ -1038,6 +1042,12 @@ are (1) no self-test log printed, even though you have run self-tests;
 number of ATA errors reported is byte swapped.  Enabling this option
 tells \fBsmartd\fP to evaluate this quantity in byte-reversed order.
 
+.I samsung3
+\- Some Samsung disks (at least SP2514N with Firmware VF100\-37) report
+a self\-test still in progress with 0% remaining when the test was already
+completed. If this directive is specified, \fBsmartd\fP will not skip the
+next scheduled self\-test (see Directive \'\-s\' above) in this case.
+
 Note that an explicit \'\-F\' Directive will over-ride any preset
 values for \'\-F\' (see the \'\-P\' option below).
 
@@ -1347,4 +1357,4 @@ SEE ALSO:
 
 .SH
 CVS ID OF THIS PAGE:
-$Id: smartd.conf.5.in,v 1.82 2006/12/20 07:30:43 sxzzsf Exp $
+$Id: smartd.conf.5.in,v 1.86 2007/10/20 13:02:50 chrfranke Exp $