Refreshed patches

[mirror_smartmontools-debian.git] / debian / patches / 61_cciss-doc.patch

diff --git a/debian/patches/61_cciss-doc.patch b/debian/patches/61_cciss-doc.patch
index 26f5c4dbf2798e722a8219a2a7deb4fb8188dc23..ee672c0ae4551bc57921a0513a97de4775ebf390 100644 (file)
--- a/debian/patches/61_cciss-doc.patch
+++ b/debian/patches/61_cciss-doc.patch
@@ -6,25 +6,8 @@ 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
 
-Index: smartmontools/smartd.8.in
-===================================================================
---- smartmontools.orig/smartd.8.in     2013-09-05 13:32:17.291972468 +0200
-+++ smartmontools/smartd.8.in  2013-09-05 13:32:17.283972468 +0200
-@@ -153,6 +153,10 @@
- .SH 
- OPTIONS
- 
-+.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 \-A PREFIX, \-\-attributelog=PREFIX
- Writes \fBsmartd\fP attribute information (normalized and raw
-Index: smartmontools/smartd.conf
-===================================================================
---- smartmontools.orig/smartd.conf     2013-09-05 13:32:17.291972468 +0200
-+++ smartmontools/smartd.conf  2013-09-05 13:32:17.283972468 +0200
+--- a/smartd.conf
++++ b/smartd.conf
 @@ -92,6 +92,12 @@
  # NOTE: On Windows, DEVICESCAN works also for 3ware controllers.
  #/dev/hdc,0 -a -s L/../../2/01
@@ -38,11 +21,9 @@ Index: smartmontools/smartd.conf
  
  # Monitor 3 ATA disks directly connected to a HighPoint RocketRAID. Start long
  # self-tests Sundays between 1-2, 2-3, and 3-4 am. 
-Index: smartmontools/smartd.conf.5.in
-===================================================================
---- smartmontools.orig/smartd.conf.5.in        2013-09-05 13:32:17.291972468 +0200
-+++ smartmontools/smartd.conf.5.in     2013-09-05 13:32:17.287972468 +0200
-@@ -97,10 +97,11 @@
+--- a/smartd.conf.5.in
++++ b/smartd.conf.5.in
+@@ -92,10 +92,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
@@ -58,21 +39,20 @@ Index: smartmontools/smartd.conf.5.in
  .B # device, four SATA disks connected to an Areca
  .B # RAID controller, and one SATA disk.
  .B #
-@@ -178,6 +179,13 @@
+@@ -170,6 +171,12 @@
+ .B \ \ /dev/tws0 -d 3ware,1 -a -s L/../../7/02
  .\" %ENDIF OS FreeBSD
  .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.
-@@ -1497,6 +1505,9 @@
+@@ -1463,6 +1470,9 @@
  If you want more frequent information, use:
  .B -a.