proxmox-mirrors/mirror_smartmontools-debian
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_smartmontools-debian synced 2025-08-15 17:54:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refresh patch

Browse Source 
TODO check that the result looks sensible, forward upstream
This commit is contained in:
Jonathan Dowland 2018-08-09 16:55:20 +01:00 committed by SZ Lin (林上智)
parent cb41a0f8e5
commit 5744dacb39
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,11 +1,13 @@
smartmontools (6.6-1) UNRELEASED; urgency=medium smartmontools (6.6-2) UNRELEASED; urgency=medium
* Update Vcs-* headers in control file: replace Alioth/anonscm URIs * Update Vcs-* headers in control file: replace Alioth/anonscm URIs
with salsa.debian.org. with salsa.debian.org.
* new upstream version. Patches refreshed: * new upstream version. Patches refreshed:
* 50_manpage_improvements.diff removed (integrated upstream) * 61_cciss-doc.patch
Patches removed:
* 50_manpage_improvements.diff
-- Jonathan Dowland <jmtd@debian.org> Thu, 09 Aug 2018 16:46:03 +0100 -- Jonathan Dowland <jmtd@debian.org> Thu, 09 Aug 2018 16:54:43 +0100
smartmontools (6.5+svn4324-1) unstable; urgency=low smartmontools (6.5+svn4324-1) unstable; urgency=low

43
debian/patches/61_cciss-doc.patch vendored
View File

@ -6,9 +6,13 @@ 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 patch gets things to parity with the 3ware documentation with a couple
minor exceptions minor exceptions
Refreshed by jmtd@debian.org 2018-08-10
diff --git a/smartd.conf b/smartd.conf
index 5490bde..59addd4 100644
--- a/smartd.conf --- a/smartd.conf
+++ b/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. # NOTE: On Windows, DEVICESCAN works also for 3ware controllers.
#/dev/hdc,0 -a -s L/../../2/01 #/dev/hdc,0 -a -s L/../../2/01
#/dev/hdc,1 -a -s L/../../2/03 #/dev/hdc,1 -a -s L/../../2/03
@ -21,28 +25,31 @@ minor exceptions
# Monitor 3 ATA disks directly connected to a HighPoint RocketRAID. Start long # Monitor 3 ATA disks directly connected to a HighPoint RocketRAID. Start long
# self-tests Sundays between 1-2, 2-3, and 3-4 am. # 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 --- a/smartd.conf.5.in
+++ b/smartd.conf.5.in +++ b/smartd.conf.5.in
@@ -157,6 +157,12 @@ @@ -162,6 +162,12 @@ Section below!
.B \ \ /dev/tws0 \-d 3ware,1 \-a \-s L/../../7/02
.\" %ENDIF OS FreeBSD .\" %ENDIF OS FreeBSD
.B # .\" %IF OS FreeBSD Linux
+.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 +# Monitor 2 disks connected to the first HP SmartArray controller which
+.B # self-tests every night and send errors to root +# uses the cciss driver. Start long tests on Sunday nights and short
+.B \ \ /dev/cciss/c0d0 -d cciss,0 -a -s (L/../../7/02|S/../.././02) -m root +# self-tests every night and send errors to root
+.B \ \ /dev/cciss/c0d0 -d cciss,1 -a -s (L/../../7/03|S/../.././03) -m root +# \ /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 # Three SATA disks on a HighPoint RocketRAID controller. +#
.B # Start short self-tests daily between 1\(en2, 2\(en3, and # Three SATA disks on a HighPoint RocketRAID controller.
.B # 3\(en4 am. # Start short self\-tests daily between 1\-2, 2\-3, and
@@ -1492,6 +1498,9 @@ # 3\-4 am.
If you want more frequent information, use: @@ -1553,6 +1559,10 @@ configuration file Directives might be:
.B \-a. If you want more frequent information, use: \fB\-a\fP.
.Sp
.TP
+.B If a cciss controller is used +.B If a cciss controller is used
+then the corresponding block device (/dev/cciss/c?d?) must be listed, +then the corresponding block device (/dev/cciss/c?d?) must be listed,
+along with the \'\-d cciss,N\' Directive (see below). +along with the \'\-d cciss,N\' Directive (see below).
.TP +.TP
.B ADDITIONAL DETAILS ABOUT DEVICESCAN .B ADDITIONAL DETAILS ABOUT DEVICESCAN
If a non-comment entry in the configuration file is the text If a non-comment entry in the configuration file is the text
string \fBDEVICESCAN\fP in capital letters, then \fBsmartd\fP will