From b5b85bae9259fc874e24d43d26c3810e79aef8a4 Mon Sep 17 00:00:00 2001 From: Giuseppe Iuculano Date: Sun, 20 Mar 2011 16:57:18 +0100 Subject: [PATCH] Refreshed patches --- .../54_remove-Id-from-smartd.conf.diff | 7 +--- debian/patches/61_cciss-doc.patch | 40 ++++--------------- debian/patches/63_removable.patch | 2 +- debian/patches/manpage.diff | 4 +- debian/patches/series | 2 - 5 files changed, 13 insertions(+), 42 deletions(-) diff --git a/debian/patches/54_remove-Id-from-smartd.conf.diff b/debian/patches/54_remove-Id-from-smartd.conf.diff index 3551056..3e68e0b 100644 --- a/debian/patches/54_remove-Id-from-smartd.conf.diff +++ b/debian/patches/54_remove-Id-from-smartd.conf.diff @@ -1,13 +1,10 @@ --- a/smartd.conf +++ b/smartd.conf -@@ -1,9 +1,8 @@ --# Sample configuration file for smartd. See man smartd.conf. -+# /etc/smartd.conf -+# Configuration file for smartd. Use "man smartd.conf" for more information. +@@ -2,8 +2,6 @@ # Home page is: http://smartmontools.sourceforge.net --# $Id: smartd.conf,v 1.45 2006/11/12 23:39:04 dpgilbert Exp $ +-# $Id: smartd.conf 3128 2010-07-27 13:08:31Z chrfranke $ - # smartd will re-read the configuration file if it receives a HUP # signal diff --git a/debian/patches/61_cciss-doc.patch b/debian/patches/61_cciss-doc.patch index 62f9f6e..e0bfcad 100644 --- a/debian/patches/61_cciss-doc.patch +++ b/debian/patches/61_cciss-doc.patch @@ -8,7 +8,7 @@ minor exceptions --- a/smartd.8.in +++ b/smartd.8.in -@@ -541,10 +541,11 @@ Section below! +@@ -543,10 +543,11 @@ Section below! .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 @@ -24,8 +24,8 @@ minor exceptions .B # device, four SATA disks connected to an Areca .B # RAID controller, and one SATA disk. .B # -@@ -606,6 +607,13 @@ Section below! - .B \ \ /dev/twa0 -d 3ware,1 -a -s L/../../7/02 +@@ -615,6 +616,13 @@ Section below! + .B \ \ /dev/twl0 -d 3ware,1 -a -s L/../../7/02 .B # .nf +.B # Monitor 2 disks connected to the first HP SmartArray controller which @@ -38,19 +38,7 @@ minor exceptions .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. -@@ -1246,9 +1254,9 @@ is set to the argument of \-M exec, if p - .IP \fBSMARTD_DEVICE\fP 4 - is set to the device path (examples: /dev/hda, /dev/sdb). - .IP \fBSMARTD_DEVICETYPE\fP 4 --is set to the device type (possible values: ata, scsi, 3ware,N, -+is set to the device type (possible values: ata, scsi, 3ware, cciss, N, - areca,N, hpt,L/M/N). Here N=0,...,127 denotes the ATA disk behind a --3ware RAID controller and L/M/N denotes the SATA disk behind a -+3ware or cciss RAID controller and L/M/N denotes the SATA disk behind a - HighPoint RocketRAID controller. - .IP \fBSMARTD_DEVICESTRING\fP 4 - is set to the device description. For SMARTD_DEVICETYPE of ata or -@@ -1676,6 +1684,10 @@ configuration file Directives might be: +@@ -1689,6 +1697,10 @@ configuration file Directives might be: If you want more frequent information, use: .B -a. @@ -63,7 +51,7 @@ minor exceptions If a non-comment entry in the configuration file is the text --- a/smartd.conf +++ b/smartd.conf -@@ -86,6 +86,12 @@ DEVICESCAN -n standby -m root -M exec /u +@@ -91,6 +91,12 @@ DEVICESCAN -n standby -m root -M exec /u # 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 @@ -94,8 +82,8 @@ minor exceptions .B # device, four SATA disks connected to an Areca .B # RAID controller, and one SATA disk. .B # -@@ -182,6 +183,13 @@ Section below! - .B \ \ /dev/twa0 -d 3ware,1 -a -s L/../../7/02 +@@ -189,6 +190,13 @@ Section below! + .B \ \ /dev/twl0 -d 3ware,1 -a -s L/../../7/02 .B # .nf +.B # Monitor 2 disks connected to the first HP SmartArray controller which @@ -108,19 +96,7 @@ minor exceptions .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. -@@ -822,9 +830,9 @@ is set to the argument of \-M exec, if p - .IP \fBSMARTD_DEVICE\fP 4 - is set to the device path (examples: /dev/hda, /dev/sdb). - .IP \fBSMARTD_DEVICETYPE\fP 4 --is set to the device type (possible values: ata, scsi, 3ware,N, -+is set to the device type (possible values: ata, scsi, 3ware,N, cciss,N, - areca,N, hpt,L/M/N). Here N=0,...,127 denotes the ATA disk behind a --3ware RAID controller and L/M/N denotes the SATA disk behind a -+3ware or cciss RAID controller and L/M/N denotes the SATA disk behind a - HighPoint RocketRAID controller. - .IP \fBSMARTD_DEVICESTRING\fP 4 - is set to the device description. For SMARTD_DEVICETYPE of ata or -@@ -1252,6 +1260,9 @@ configuration file Directives might be: +@@ -1263,6 +1271,9 @@ configuration file Directives might be: If you want more frequent information, use: .B -a. diff --git a/debian/patches/63_removable.patch b/debian/patches/63_removable.patch index fd6446e..20b2fc2 100644 --- a/debian/patches/63_removable.patch +++ b/debian/patches/63_removable.patch @@ -3,7 +3,7 @@ Added the removable option by default. This indicates to smartd that it should c Closes: #406130 --- a/smartd.conf +++ b/smartd.conf -@@ -19,7 +19,7 @@ +@@ -18,7 +18,7 @@ # Directives listed below, which will be applied to all devices that # are found. Most users should comment out DEVICESCAN and explicitly # list the devices that they wish to monitor. diff --git a/debian/patches/manpage.diff b/debian/patches/manpage.diff index d2d876c..ee0e7d8 100644 --- a/debian/patches/manpage.diff +++ b/debian/patches/manpage.diff @@ -1,7 +1,7 @@ Fixed example path in man pages --- a/smartd.8.in +++ b/smartd.8.in -@@ -1771,7 +1771,7 @@ sleep 30 +@@ -1784,7 +1784,7 @@ sleep 30 .fi Some example scripts are distributed with the smartmontools package, @@ -12,7 +12,7 @@ Fixed example path in man pages that they read/write should not be writable by ordinary users or --- a/smartd.conf.5.in +++ b/smartd.conf.5.in -@@ -1346,7 +1346,7 @@ sleep 30 +@@ -1357,7 +1357,7 @@ sleep 30 .fi Some example scripts are distributed with the smartmontools package, diff --git a/debian/patches/series b/debian/patches/series index 2cb795a..d4ef71d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,8 +1,6 @@ 52_remove-pragma.diff 53_use-smartd-runner-by-default.diff 54_remove-Id-from-smartd.conf.diff -60_remove-redhatism.diff 61_cciss-doc.patch 63_removable.patch manpage.diff -3w-sas -- 2.39.2