new patch 61_cciss-doc.patch

update ccis examples/docs
Closes: #488371
Thanks: Matt Taggart

diff --git a/debian/patches/61_cciss-doc.patch b/debian/patches/61_cciss-doc.patch
new file mode 100644 (file)
index 0000000..a2b73d3
--- /dev/null
+++ b/debian/patches/61_cciss-doc.patch
@@ -0,0 +1,141 @@
+Author: Matt Taggart <taggart@debian.org>
+Subject: Update cciss examples/docs
+
+Here is a patch that adds examples for cciss to the default smartd.conf
+file and adds some more cciss documentation to the manpages. I think this
+patch gets things to parity with the 3ware documentation with a couple
+minor exceptions
+
+diff -ur smartmontools-5.38/smartd.8.in smartmontools-5.38.new/smartd.8.in
+--- smartmontools-5.38/smartd.8.in     2008-03-04 14:09:47.000000000 -0800
++++ smartmontools-5.38.new/smartd.8.in 2008-06-28 04:07:26.000000000 -0700
+@@ -496,11 +496,11 @@
+ .B # This is an example smartd startup config file
+ .B # /usr/local/etc/smartd.conf for monitoring three
+ .B # ATA disks, three SCSI disks, six ATA disks
+-.B # behind two 3ware controllers, three SATA disks
+-.B # directly connected to the highpoint rocket-
+-.B # raid controller, two SATA disks connected to
+-.B # the highpoint rocketraid controller via a pmport
+-.B # device and one SATA disk.
++.B # behind two 3ware controllers, two disks on a cciss
++.B # controller, three SATA disks directly connected to
++.B # the highpoint rocket-raid controller, two SATA
++.B # disks connected to the highpoint rocketraid
++.B # controller via a pmport device and one SATA disk.
+ .B #
+ .nf
+ .B # First ATA disk on two different interfaces. On
+@@ -551,6 +551,13 @@
+ .B \ \ /dev/twa0 -d 3ware,1 -a -s L/../../7/02
+ .B #
+ .nf
++.B # Monitor 2 disks connected to the first HP SmartArray controller which
++.B # uses the cciss driver. Start long tests on Sunday nights and short
++.B # self-tests every night and send errors to root
++.B \ \ /dev/cciss/c0d0 -d cciss,0 -a -s (L/../../7/02|S/../.././02) -m root
++.B \ \ /dev/cciss/c0d0 -d cciss,1 -a -s (L/../../7/03|S/../.././03) -m root
++.B #
++.nf
+ .B # Three SATA disks on a highpoint rocketraid controller.
+ .B # Start short self-tests daily between 1-2, 2-3, and
+ .B # 3-4 am.
+@@ -630,6 +637,10 @@
+ appear to \fBsmartd\fP as normal ATA devices.  Hence all the ATA
+ directives can be used for these disks (but see note below).
+ 
++.B If a cciss controller is used
++then the corresponding block device (/dev/cciss/c?d?) must be listed,
++along with the \'\-d cciss,N\' Directive (see below).
++
+ .TP
+ .B \-d TYPE
+ Specifies the type of the device.  This Directive may be used multiple
+@@ -1110,9 +1121,10 @@
+ .IP \fBSMARTD_DEVICE\fP 4
+ 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,...,23 denotes the ATA disk behind a 3ware RAID controller and
+-L/M/N denotes the SATA disk behind a HighPoint RocketRAID controller.
++is set to the device type (possible values: ata, scsi, 3ware,N, cciss,N,
++hpt,L/M/N). Here N=0,...,23 denotes the ATA disk behind a 3ware or cciss
++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
+ scsi, this is the same as SMARTD_DEVICE.  For 3ware RAID controllers,
+diff -ur smartmontools-5.38/smartd.conf smartmontools-5.38.new/smartd.conf
+--- smartmontools-5.38/smartd.conf     2006-11-12 15:39:04.000000000 -0800
++++ smartmontools-5.38.new/smartd.conf 2008-06-28 03:29:45.000000000 -0700
+@@ -87,6 +87,12 @@
+ # NOTE: On Windows, DEVICESCAN works also for 3ware controllers.
+ #/dev/hdc,0 -a -s L/../../2/01
+ #/dev/hdc,1 -a -s L/../../2/03
++#
++# Monitor 2 disks connected to the first HP SmartArray controller which
++# uses the cciss driver. Start long tests on Sunday nights and short
++# self-tests every night and send errors to root
++#/dev/cciss/c0d0 -d cciss,0 -a -s (L/../../7/02|S/../.././02) -m root
++#/dev/cciss/c0d0 -d cciss,1 -a -s (L/../../7/03|S/../.././03) -m root
+ 
+ # Monitor 3 ATA disks directly connected to a HighPoint RocketRAID. Start long
+ # self-tests Sundays between 1-2, 2-3, and 3-4 am. 
+diff -ur smartmontools-5.38/smartd.conf.5.in smartmontools-5.38.new/smartd.conf.5.in
+--- smartmontools-5.38/smartd.conf.5.in        2008-06-28 03:57:05.000000000 -0700
++++ smartmontools-5.38.new/smartd.conf.5.in    2008-06-28 04:04:51.000000000 -0700
+@@ -118,11 +118,11 @@
+ .B # This is an example smartd startup config file
+ .B # /usr/local/etc/smartd.conf for monitoring three
+ .B # ATA disks, three SCSI disks, six ATA disks
+-.B # behind two 3ware controllers, three SATA disks
+-.B # directly connected to the highpoint rocket-
+-.B # raid controller, two SATA disks connected to
+-.B # the highpoint controller via a pmport device
+-.B # and one SATA disk.
++.B # behind two 3ware controllers, two disks on a cciss
++.B # controller, three SATA disks directly connected
++.B # to the highpoint rocket-raid controller, two
++.B # SATA disks connected to the highpoint controller
++.B # via a pmport device and one SATA disk.
+ .B #
+ .nf
+ .B # First ATA disk on two different interfaces. On
+@@ -173,6 +173,13 @@
+ .B \ \ /dev/twa0 -d 3ware,1 -a -s L/../../7/02
+ .B #
+ .nf
++.B # Monitor 2 disks connected to the first HP SmartArray controller which
++.B # uses the cciss driver. Start long tests on Sunday nights and short
++.B # self-tests every night and send errors to root
++.B \ \ /dev/cciss/c0d0 -d cciss,0 -a -s (L/../../7/02|S/../.././02) -m root
++.B \ \ /dev/cciss/c0d0 -d cciss,1 -a -s (L/../../7/03|S/../.././03) -m root
++.B #
++.nf
+ .B # Three SATA disks on a highpoint rocketraid controller.
+ .B # Start short self-tests daily between 1-2, 2-3, and
+ .B # 3-4 am.
+@@ -252,6 +259,9 @@
+ appear to \fBsmartd\fP as normal ATA devices.  Hence all the ATA
+ directives can be used for these disks (but see note below).
+ 
++.B If a cciss controller is used
++then the corresponding block device (/dev/cciss/c?d?) must be listed,
++along with the \'\-d cciss,N\' Directive (see below).
+ .TP
+ .B \-d TYPE
+ Specifies the type of the device.  This Directive may be used multiple
+@@ -732,9 +742,10 @@
+ .IP \fBSMARTD_DEVICE\fP 4
+ 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,...,23 denotes the ATA disk behind a 3ware RAID controller and
+-L/M/N denotes the SATA disk behind a HighPoint RocketRAID controller.
++is set to the device type (possible values: ata, scsi, 3ware,N, cciss,N,
++hpt,L/M/N). Here N=0,...,23 denotes the ATA disk behind a 3ware or cciss
++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
+ scsi, this is the same as SMARTD_DEVICE.  For 3ware RAID controllers,

diff --git a/debian/patches/series b/debian/patches/series
index 4f4b14e1b391426d768cf708eb40b2226cf470ed..9a214ed4d570b792406c2cab0e99ba21cf13aa84 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 53_use-smartd-runner-by-default.diff
 54_remove-Id-from-smartd.conf.diff
 60_remove-redhatism.diff
+61_cciss-doc.patch