Refresh original patches with new upstream release

[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 ee672c0ae4551bc57921a0513a97de4775ebf390..26e48e664b7c700fea3516a43ff131ff7b5c6f3e 100644 (file)
--- a/debian/patches/61_cciss-doc.patch
+++ b/debian/patches/61_cciss-doc.patch
@@ -1,4 +1,5 @@
-Author: Matt Taggart <taggart@debian.org>
+From: Giuseppe Iuculano <iuculano@debian.org>
+Date: Thu, 27 Sep 2018 19:03:07 +0800
 Subject: Update cciss examples/docs
 
 Here is a patch that adds examples for cciss to the default smartd.conf
@@ -6,9 +7,17 @@ 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
 
+Refreshed by jmtd@debian.org 2018-08-10
+---
+ smartd.conf      |  6 ++++++
+ smartd.conf.5.in | 10 ++++++++++
+ 2 files changed, 16 insertions(+)
+
+diff --git a/smartd.conf b/smartd.conf
+index 5490bde..59addd4 100644
 --- a/smartd.conf
 +++ b/smartd.conf
-@@ -92,6 +92,12 @@
+@@ -92,6 +92,12 @@ DEVICESCAN -n standby -m root -M exec /usr/share/smartmontools/smartd-runner
  # 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
@@ -21,44 +30,31 @@ minor exceptions
  
  # 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 --git a/smartd.conf.5.in b/smartd.conf.5.in
+index 0afba1b..4c1f453 100644
 --- 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
--.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 # behind two 3ware controllers, two disks on a cciss
-+.B # controller, three SATA disks directly connected
-+.B # to the HighPoint Rocket-RAID controller,
-+.B # two SATA disks connected to the HighPoint
-+.B # RocketRAID controller via a pmport
- .B # device, four SATA disks connected to an Areca
- .B # RAID controller, and one SATA disk.
- .B #
-@@ -170,6 +171,12 @@
- .B \ \ /dev/tws0 -d 3ware,1 -a -s L/../../7/02
+@@ -162,6 +162,12 @@ Section below!
  .\" %ENDIF OS FreeBSD
- .B #
-+.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 #
- .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.
-@@ -1463,6 +1470,9 @@
- If you want more frequent information, use:
- .B -a.
- 
+ .\" %IF OS FreeBSD Linux
+ #
++# 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
++#
+ # Three SATA disks on a HighPoint RocketRAID controller.
+ # Start short self\-tests daily between 1\-2, 2\-3, and
+ # 3\-4 am.
+@@ -1553,6 +1559,10 @@ configuration file Directives might be:
+ If you want more frequent information, use: \fB\-a\fP.
+ .Sp
+ .TP
 +.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
++.TP
  .B ADDITIONAL DETAILS ABOUT DEVICESCAN
  If a non-comment entry in the configuration file is the text
+ string \fBDEVICESCAN\fP in capital letters, then \fBsmartd\fP will