debian/patches/61_cciss-doc.patch

   1 Author: Matt Taggart <taggart@debian.org>
   2 Subject: Update cciss examples/docs
   3
   4 Here is a patch that adds examples for cciss to the default smartd.conf
   5 file and adds some more cciss documentation to the manpages. I think this
   6 patch gets things to parity with the 3ware documentation with a couple
   7 minor exceptions
   8
   9 diff -ur smartmontools-5.38/smartd.8.in smartmontools-5.38.new/smartd.8.in
  10 --- smartmontools-5.38/smartd.8.in      2008-03-04 14:09:47.000000000 -0800
  11 +++ smartmontools-5.38.new/smartd.8.in  2008-06-28 04:07:26.000000000 -0700
  12 @@ -496,11 +496,11 @@
  13  .B # This is an example smartd startup config file
  14  .B # /usr/local/etc/smartd.conf for monitoring three
  15  .B # ATA disks, three SCSI disks, six ATA disks
  16 -.B # behind two 3ware controllers, three SATA disks
  17 -.B # directly connected to the highpoint rocket-
  18 -.B # raid controller, two SATA disks connected to
  19 -.B # the highpoint rocketraid controller via a pmport
  20 -.B # device and one SATA disk.
  21 +.B # behind two 3ware controllers, two disks on a cciss
  22 +.B # controller, three SATA disks directly connected to
  23 +.B # the highpoint rocket-raid controller, two SATA
  24 +.B # disks connected to the highpoint rocketraid
  25 +.B # controller via a pmport device and one SATA disk.
  26  .B #
  27  .nf
  28  .B # First ATA disk on two different interfaces. On
  29 @@ -551,6 +551,13 @@
  30  .B \ \ /dev/twa0 -d 3ware,1 -a -s L/../../7/02
  31  .B #
  32  .nf
  33 +.B # Monitor 2 disks connected to the first HP SmartArray controller which
  34 +.B # uses the cciss driver. Start long tests on Sunday nights and short
  35 +.B # self-tests every night and send errors to root
  36 +.B \ \ /dev/cciss/c0d0 -d cciss,0 -a -s (L/../../7/02|S/../.././02) -m root
  37 +.B \ \ /dev/cciss/c0d0 -d cciss,1 -a -s (L/../../7/03|S/../.././03) -m root
  38 +.B #
  39 +.nf
  40  .B # Three SATA disks on a highpoint rocketraid controller.
  41  .B # Start short self-tests daily between 1-2, 2-3, and
  42  .B # 3-4 am.
  43 @@ -630,6 +637,10 @@
  44  appear to \fBsmartd\fP as normal ATA devices.  Hence all the ATA
  45  directives can be used for these disks (but see note below).
  46
  47 +.B If a cciss controller is used
  48 +then the corresponding block device (/dev/cciss/c?d?) must be listed,
  49 +along with the \'\-d cciss,N\' Directive (see below).
  50 +
  51  .TP
  52  .B \-d TYPE
  53  Specifies the type of the device.  This Directive may be used multiple
  54 @@ -1110,9 +1121,10 @@
  55  .IP \fBSMARTD_DEVICE\fP 4
  56  is set to the device path (examples: /dev/hda, /dev/sdb).
  57  .IP \fBSMARTD_DEVICETYPE\fP 4
  58 -is set to the device type (possible values: ata, scsi, 3ware,N, hpt,L/M/N).
  59 -Here N=0,...,23 denotes the ATA disk behind a 3ware RAID controller and
  60 -L/M/N denotes the SATA disk behind a HighPoint RocketRAID controller.
  61 +is set to the device type (possible values: ata, scsi, 3ware,N, cciss,N,
  62 +hpt,L/M/N). Here N=0,...,23 denotes the ATA disk behind a 3ware or cciss
  63 +RAID controller and L/M/N denotes the SATA disk behind a HighPoint
  64 +RocketRAID controller.
  65  .IP \fBSMARTD_DEVICESTRING\fP 4
  66  is set to the device description.  For SMARTD_DEVICETYPE of ata or
  67  scsi, this is the same as SMARTD_DEVICE.  For 3ware RAID controllers,
  68 diff -ur smartmontools-5.38/smartd.conf smartmontools-5.38.new/smartd.conf
  69 --- smartmontools-5.38/smartd.conf      2006-11-12 15:39:04.000000000 -0800
  70 +++ smartmontools-5.38.new/smartd.conf  2008-06-28 03:29:45.000000000 -0700
  71 @@ -87,6 +87,12 @@
  72  # NOTE: On Windows, DEVICESCAN works also for 3ware controllers.
  73  #/dev/hdc,0 -a -s L/../../2/01
  74  #/dev/hdc,1 -a -s L/../../2/03
  75 +#
  76 +# Monitor 2 disks connected to the first HP SmartArray controller which
  77 +# uses the cciss driver. Start long tests on Sunday nights and short
  78 +# self-tests every night and send errors to root
  79 +#/dev/cciss/c0d0 -d cciss,0 -a -s (L/../../7/02|S/../.././02) -m root
  80 +#/dev/cciss/c0d0 -d cciss,1 -a -s (L/../../7/03|S/../.././03) -m root
  81
  82  # Monitor 3 ATA disks directly connected to a HighPoint RocketRAID. Start long
  83  # self-tests Sundays between 1-2, 2-3, and 3-4 am.
  84 diff -ur smartmontools-5.38/smartd.conf.5.in smartmontools-5.38.new/smartd.conf.5.in
  85 --- smartmontools-5.38/smartd.conf.5.in 2008-06-28 03:57:05.000000000 -0700
  86 +++ smartmontools-5.38.new/smartd.conf.5.in     2008-06-28 04:04:51.000000000 -0700
  87 @@ -118,11 +118,11 @@
  88  .B # This is an example smartd startup config file
  89  .B # /usr/local/etc/smartd.conf for monitoring three
  90  .B # ATA disks, three SCSI disks, six ATA disks
  91 -.B # behind two 3ware controllers, three SATA disks
  92 -.B # directly connected to the highpoint rocket-
  93 -.B # raid controller, two SATA disks connected to
  94 -.B # the highpoint controller via a pmport device
  95 -.B # and one SATA disk.
  96 +.B # behind two 3ware controllers, two disks on a cciss
  97 +.B # controller, three SATA disks directly connected
  98 +.B # to the highpoint rocket-raid controller, two
  99 +.B # SATA disks connected to the highpoint controller
 100 +.B # via a pmport device and one SATA disk.
 101  .B #
 102  .nf
 103  .B # First ATA disk on two different interfaces. On
 104 @@ -173,6 +173,13 @@
 105  .B \ \ /dev/twa0 -d 3ware,1 -a -s L/../../7/02
 106  .B #
 107  .nf
 108 +.B # Monitor 2 disks connected to the first HP SmartArray controller which
 109 +.B # uses the cciss driver. Start long tests on Sunday nights and short
 110 +.B # self-tests every night and send errors to root
 111 +.B \ \ /dev/cciss/c0d0 -d cciss,0 -a -s (L/../../7/02|S/../.././02) -m root
 112 +.B \ \ /dev/cciss/c0d0 -d cciss,1 -a -s (L/../../7/03|S/../.././03) -m root
 113 +.B #
 114 +.nf
 115  .B # Three SATA disks on a highpoint rocketraid controller.
 116  .B # Start short self-tests daily between 1-2, 2-3, and
 117  .B # 3-4 am.
 118 @@ -252,6 +259,9 @@
 119  appear to \fBsmartd\fP as normal ATA devices.  Hence all the ATA
 120  directives can be used for these disks (but see note below).
 121
 122 +.B If a cciss controller is used
 123 +then the corresponding block device (/dev/cciss/c?d?) must be listed,
 124 +along with the \'\-d cciss,N\' Directive (see below).
 125  .TP
 126  .B \-d TYPE
 127  Specifies the type of the device.  This Directive may be used multiple
 128 @@ -732,9 +742,10 @@
 129  .IP \fBSMARTD_DEVICE\fP 4
 130  is set to the device path (examples: /dev/hda, /dev/sdb).
 131  .IP \fBSMARTD_DEVICETYPE\fP 4
 132 -is set to the device type (possible values: ata, scsi, 3ware,N, hpt,L/M/N).
 133 -Here N=0,...,23 denotes the ATA disk behind a 3ware RAID controller and
 134 -L/M/N denotes the SATA disk behind a HighPoint RocketRAID controller.
 135 +is set to the device type (possible values: ata, scsi, 3ware,N, cciss,N,
 136 +hpt,L/M/N). Here N=0,...,23 denotes the ATA disk behind a 3ware or cciss
 137 +RAID controller and L/M/N denotes the SATA disk behind a HighPoint
 138 +RocketRAID controller.
 139  .IP \fBSMARTD_DEVICESTRING\fP 4
 140  is set to the device description.  For SMARTD_DEVICETYPE of ata or
 141  scsi, this is the same as SMARTD_DEVICE.  For 3ware RAID controllers,