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 @@ -543,10 +543,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 @@ -615,6 +616,13 @@ Section below!
  28  .B \ \ /dev/twl0 -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 @@ -1689,6 +1697,10 @@ configuration file Directives might be:
  42  If you want more frequent information, use:
  43  .B -a.
  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 ADDITIONAL DETAILS ABOUT DEVICESCAN
  51  If a non-comment entry in the configuration file is the text
  52 --- a/smartd.conf
  53 +++ b/smartd.conf
  54 @@ -91,6 +91,12 @@ DEVICESCAN -n standby -m root -M exec /u
  55  # NOTE: On Windows, DEVICESCAN works also for 3ware controllers.
  56  #/dev/hdc,0 -a -s L/../../2/01
  57  #/dev/hdc,1 -a -s L/../../2/03
  58 +#
  59 +# Monitor 2 disks connected to the first HP SmartArray controller which
  60 +# uses the cciss driver. Start long tests on Sunday nights and short
  61 +# self-tests every night and send errors to root
  62 +#/dev/cciss/c0d0 -d cciss,0 -a -s (L/../../7/02|S/../.././02) -m root
  63 +#/dev/cciss/c0d0 -d cciss,1 -a -s (L/../../7/03|S/../.././03) -m root
  64
  65  # Monitor 3 ATA disks directly connected to a HighPoint RocketRAID. Start long
  66  # self-tests Sundays between 1-2, 2-3, and 3-4 am.
  67 --- a/smartd.conf.5.in
  68 +++ b/smartd.conf.5.in
  69 @@ -117,10 +117,11 @@ Section below!
  70  .B # This is an example smartd startup config file
  71  .B # /usr/local/etc/smartd.conf for monitoring three
  72  .B # ATA disks, three SCSI disks, six ATA disks
  73 -.B # behind two 3ware controllers, three SATA disks
  74 -.B # directly connected to the HighPoint Rocket-
  75 -.B # RAID controller, two SATA disks connected to
  76 -.B # the HighPoint RocketRAID controller via a pmport
  77 +.B # behind two 3ware controllers, two disks on a cciss
  78 +.B # controller, three SATA disks directly connected
  79 +.B # to the HighPoint Rocket-RAID controller,
  80 +.B # two SATA disks connected to the HighPoint
  81 +.B # RocketRAID controller via a pmport
  82  .B # device, four SATA disks connected to an Areca
  83  .B # RAID controller, and one SATA disk.
  84  .B #
  85 @@ -189,6 +190,13 @@ Section below!
  86  .B \ \ /dev/twl0 -d 3ware,1 -a -s L/../../7/02
  87  .B #
  88  .nf
  89 +.B # Monitor 2 disks connected to the first HP SmartArray controller which
  90 +.B # uses the cciss driver. Start long tests on Sunday nights and short
  91 +.B # self-tests every night and send errors to root
  92 +.B \ \ /dev/cciss/c0d0 -d cciss,0 -a -s (L/../../7/02|S/../.././02) -m root
  93 +.B \ \ /dev/cciss/c0d0 -d cciss,1 -a -s (L/../../7/03|S/../.././03) -m root
  94 +.B #
  95 +.nf
  96  .B # Three SATA disks on a HighPoint RocketRAID controller.
  97  .B # Start short self-tests daily between 1-2, 2-3, and
  98  .B # 3-4 am.
  99 @@ -1263,6 +1271,9 @@ configuration file Directives might be:
 100  If you want more frequent information, use:
 101  .B -a.
 102
 103 +.B If a cciss controller is used
 104 +then the corresponding block device (/dev/cciss/c?d?) must be listed,
 105 +along with the \'\-d cciss,N\' Directive (see below).
 106  .TP
 107  .B ADDITIONAL DETAILS ABOUT DEVICESCAN
 108  If a non-comment entry in the configuration file is the text