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 --- a/smartd.8.in
  10 +++ b/smartd.8.in
  11 @@ -548,10 +548,11 @@ Section below!
  12  .B # This is an example smartd startup config file
  13  .B # /usr/local/etc/smartd.conf for monitoring three
  14  .B # ATA disks, three SCSI disks, six ATA disks
  15 -.B # behind two 3ware controllers, three SATA disks
  16 -.B # directly connected to the HighPoint Rocket-
  17 -.B # RAID controller, two SATA disks connected to
  18 -.B # the HighPoint RocketRAID controller via a pmport
  19 +.B # behind two 3ware controllers, two disks on a cciss
  20 +.B # controller, three SATA disks directly connected
  21 +.B # to the HighPoint Rocket-RAID controller,
  22 +.B # two SATA disks connected to the HighPoint
  23 +.B # RocketRAID controller via a pmport
  24  .B # device, four SATA disks connected to an Areca
  25  .B # RAID controller, and one SATA disk.
  26  .B #
  27 @@ -613,6 +614,13 @@ Section below!
  28  .B \ \ /dev/twa0 -d 3ware,1 -a -s L/../../7/02
  29  .B #
  30  .nf
  31 +.B # Monitor 2 disks connected to the first HP SmartArray controller which
  32 +.B # uses the cciss driver. Start long tests on Sunday nights and short
  33 +.B # self-tests every night and send errors to root
  34 +.B \ \ /dev/cciss/c0d0 -d cciss,0 -a -s (L/../../7/02|S/../.././02) -m root
  35 +.B \ \ /dev/cciss/c0d0 -d cciss,1 -a -s (L/../../7/03|S/../.././03) -m root
  36 +.B #
  37 +.nf
  38  .B # Three SATA disks on a HighPoint RocketRAID controller.
  39  .B # Start short self-tests daily between 1-2, 2-3, and
  40  .B # 3-4 am.
  41 @@ -718,6 +726,10 @@ these disks.  Areca firmware version 1.4
  42  smartmontools must be used; Please see the \fBsmartctl\fP man page for
  43  further details.
  44
  45 +.B If a cciss controller is used
  46 +then the corresponding block device (/dev/cciss/c?d?) must be listed,
  47 +along with the \'\-d cciss,N\' Directive (see below).
  48 +
  49  .TP
  50  .B \-d TYPE
  51  Specifies the type of the device.  This Directive may be used multiple
  52 @@ -1249,9 +1261,9 @@ is set to the argument of \-M exec, if p
  53  .IP \fBSMARTD_DEVICE\fP 4
  54  is set to the device path (examples: /dev/hda, /dev/sdb).
  55  .IP \fBSMARTD_DEVICETYPE\fP 4
  56 -is set to the device type (possible values: ata, scsi, 3ware,N,
  57 +is set to the device type (possible values: ata, scsi, 3ware,N, cciss,N,
  58  areca,N, hpt,L/M/N).  Here N=0,...,127 denotes the ATA disk behind a
  59 -3ware RAID controller and L/M/N denotes the SATA disk behind a
  60 +3ware or cciss RAID controller and L/M/N denotes the SATA disk behind a
  61  HighPoint RocketRAID controller.
  62  .IP \fBSMARTD_DEVICESTRING\fP 4
  63  is set to the device description.  For SMARTD_DEVICETYPE of ata or
  64 --- a/smartd.conf
  65 +++ b/smartd.conf
  66 @@ -86,6 +86,12 @@ DEVICESCAN -m root -M exec /usr/share/sm
  67  # NOTE: On Windows, DEVICESCAN works also for 3ware controllers.
  68  #/dev/hdc,0 -a -s L/../../2/01
  69  #/dev/hdc,1 -a -s L/../../2/03
  70 +#
  71 +# Monitor 2 disks connected to the first HP SmartArray controller which
  72 +# uses the cciss driver. Start long tests on Sunday nights and short
  73 +# self-tests every night and send errors to root
  74 +#/dev/cciss/c0d0 -d cciss,0 -a -s (L/../../7/02|S/../.././02) -m root
  75 +#/dev/cciss/c0d0 -d cciss,1 -a -s (L/../../7/03|S/../.././03) -m root
  76
  77  # Monitor 3 ATA disks directly connected to a HighPoint RocketRAID. Start long
  78  # self-tests Sundays between 1-2, 2-3, and 3-4 am.
  79 --- a/smartd.conf.5.in
  80 +++ b/smartd.conf.5.in
  81 @@ -118,10 +118,11 @@ Section below!
  82  .B # This is an example smartd startup config file
  83  .B # /usr/local/etc/smartd.conf for monitoring three
  84  .B # ATA disks, three SCSI disks, six ATA disks
  85 -.B # behind two 3ware controllers, three SATA disks
  86 -.B # directly connected to the HighPoint Rocket-
  87 -.B # RAID controller, two SATA disks connected to
  88 -.B # the HighPoint RocketRAID controller via a pmport
  89 +.B # behind two 3ware controllers, two disks on a cciss
  90 +.B # controller, three SATA disks directly connected
  91 +.B # to the HighPoint Rocket-RAID controller,
  92 +.B # two SATA disks connected to the HighPoint
  93 +.B # RocketRAID controller via a pmport
  94  .B # device, four SATA disks connected to an Areca
  95  .B # RAID controller, and one SATA disk.
  96  .B #
  97 @@ -183,6 +184,13 @@ Section below!
  98  .B \ \ /dev/twa0 -d 3ware,1 -a -s L/../../7/02
  99  .B #
 100  .nf
 101 +.B # Monitor 2 disks connected to the first HP SmartArray controller which
 102 +.B # uses the cciss driver. Start long tests on Sunday nights and short
 103 +.B # self-tests every night and send errors to root
 104 +.B \ \ /dev/cciss/c0d0 -d cciss,0 -a -s (L/../../7/02|S/../.././02) -m root
 105 +.B \ \ /dev/cciss/c0d0 -d cciss,1 -a -s (L/../../7/03|S/../.././03) -m root
 106 +.B #
 107 +.nf
 108  .B # Three SATA disks on a HighPoint RocketRAID controller.
 109  .B # Start short self-tests daily between 1-2, 2-3, and
 110  .B # 3-4 am.
 111 @@ -288,6 +296,9 @@ these disks.  Areca firmware version 1.4
 112  smartmontools must be used; Please see the \fBsmartctl\fP man page for
 113  further details.
 114
 115 +.B If a cciss controller is used
 116 +then the corresponding block device (/dev/cciss/c?d?) must be listed,
 117 +along with the \'\-d cciss,N\' Directive (see below).
 118  .TP
 119  .B \-d TYPE
 120  Specifies the type of the device.  This Directive may be used multiple
 121 @@ -819,9 +830,9 @@ is set to the argument of \-M exec, if p
 122  .IP \fBSMARTD_DEVICE\fP 4
 123  is set to the device path (examples: /dev/hda, /dev/sdb).
 124  .IP \fBSMARTD_DEVICETYPE\fP 4
 125 -is set to the device type (possible values: ata, scsi, 3ware,N,
 126 +is set to the device type (possible values: ata, scsi, 3ware,N, cciss,N,
 127  areca,N, hpt,L/M/N).  Here N=0,...,127 denotes the ATA disk behind a
 128 -3ware RAID controller and L/M/N denotes the SATA disk behind a
 129 +3ware or cciss RAID controller and L/M/N denotes the SATA disk behind a
 130  HighPoint RocketRAID controller.
 131  .IP \fBSMARTD_DEVICESTRING\fP 4
 132  is set to the device description.  For SMARTD_DEVICETYPE of ata or