proxmox-mirrors/mirror_smartmontools-debian
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_smartmontools-debian synced 2025-11-03 19:35:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refreshed patches

Browse Source
This commit is contained in:
Giuseppe Iuculano 2012-03-07 23:32:34 +01:00
parent a3628d53b3
commit 9fcd4498a0
3 changed files with 26 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
debian/patches/52_remove-pragma.diff vendored
View File

@ -1,6 +1,6 @@
--- a/atacmds.h
+++ b/atacmds.h
@@ -119,7 +119,6 @@ enum {
@@ -134,7 +134,6 @@ enum {
// Needed parts of the ATA DRIVE IDENTIFY Structure. Those labeled
// word* are NOT used.
@ -8,7 +8,7 @@
struct ata_identify_device {
unsigned short words000_009[10];
unsigned char serial_no[20];
@@ -141,7 +140,6 @@ struct ata_identify_device {
@@ -156,7 +155,6 @@ struct ata_identify_device {
ASSERT_SIZEOF_STRUCT(ata_identify_device, 512);
/* ata_smart_attribute is the vendor specific in SFF-8035 spec */
@ -16,15 +16,15 @@
struct ata_smart_attribute {
unsigned char id;
// meaning of flag bits: see MACROS just below
@@ -202,7 +200,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_attribute
@@ -217,7 +215,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_attribute
/* ata_smart_values is format of the read drive Attribute command */
/* see Table 34 of T13/1321D Rev 1 spec (Device SMART data structure) for *some* info */
// Format of data returned by SMART READ DATA
// Table 62 of T13/1699-D (ATA8-ACS) Revision 6a, September 2008
-#pragma pack(1)
struct ata_smart_values {
unsigned short int revnumber;
struct ata_smart_attribute vendor_attributes [NUMBER_ATA_SMART_ATTRIBUTES];
@@ -234,7 +231,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_values, 5
@@ -250,7 +247,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_values, 5
*/
/* Vendor attribute of SMART Threshold (compare to ata_smart_attribute above) */
@ -32,7 +32,7 @@
struct ata_smart_threshold_entry {
unsigned char id;
unsigned char threshold;
@@ -245,7 +241,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_threshold
@@ -261,7 +257,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_threshold
/* Format of Read SMART THreshold Command */
/* Compare to ata_smart_values above */
@ -40,7 +40,7 @@
struct ata_smart_thresholds_pvt {
unsigned short int revnumber;
struct ata_smart_threshold_entry thres_entries[NUMBER_ATA_SMART_ATTRIBUTES];
@@ -257,7 +252,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_threshold
@@ -273,7 +268,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_threshold
// Table 42 of T13/1321D Rev 1 spec (Error Data Structure)
@ -48,7 +48,7 @@
struct ata_smart_errorlog_error_struct {
unsigned char reserved;
unsigned char error_register;
@@ -276,7 +270,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_
@@ -292,7 +286,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_
// Table 41 of T13/1321D Rev 1 spec (Command Data Structure)
@ -56,7 +56,7 @@
struct ata_smart_errorlog_command_struct {
unsigned char devicecontrolreg;
unsigned char featuresreg;
@@ -292,7 +285,6 @@ struct ata_smart_errorlog_command_struct
@@ -308,7 +301,6 @@ struct ata_smart_errorlog_command_struct
ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_command_struct, 12);
// Table 40 of T13/1321D Rev 1 spec (Error log data structure)
@ -64,7 +64,7 @@
struct ata_smart_errorlog_struct {
struct ata_smart_errorlog_command_struct commands[5];
struct ata_smart_errorlog_error_struct error_struct;
@@ -301,7 +293,6 @@ struct ata_smart_errorlog_struct {
@@ -317,7 +309,6 @@ struct ata_smart_errorlog_struct {
ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_struct, 90);
// Table 39 of T13/1321D Rev 1 spec (SMART error log sector)
@ -72,7 +72,7 @@
struct ata_smart_errorlog {
unsigned char revnumber;
unsigned char error_log_pointer;
@@ -398,7 +389,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_exterrlog
@@ -414,7 +405,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_exterrlog
// Table 45 of T13/1321D Rev 1 spec (Self-test log descriptor entry)
@ -80,7 +80,7 @@
struct ata_smart_selftestlog_struct {
unsigned char selftestnumber; // Sector number register
unsigned char selfteststatus;
@@ -411,7 +401,6 @@ struct ata_smart_selftestlog_struct {
@@ -427,7 +417,6 @@ struct ata_smart_selftestlog_struct {
ASSERT_SIZEOF_STRUCT(ata_smart_selftestlog_struct, 24);
// Table 44 of T13/1321D Rev 1 spec (Self-test log data structure)
@ -88,7 +88,7 @@
struct ata_smart_selftestlog {
unsigned short int revnumber;
struct ata_smart_selftestlog_struct selftest_struct[21];
@@ -460,7 +449,6 @@ struct ata_smart_extselftestlog
@@ -476,7 +465,6 @@ struct ata_smart_extselftestlog
ASSERT_SIZEOF_STRUCT(ata_smart_extselftestlog, 512);
// SMART LOG DIRECTORY Table 52 of T13/1532D Vol 1 Rev 1a
@ -96,7 +96,7 @@
struct ata_smart_log_entry {
unsigned char numsectors;
unsigned char reserved;
@@ -468,7 +456,6 @@ struct ata_smart_log_entry {
@@ -484,7 +472,6 @@ struct ata_smart_log_entry {
#pragma pack()
ASSERT_SIZEOF_STRUCT(ata_smart_log_entry, 2);
@ -104,7 +104,7 @@
struct ata_smart_log_directory {
unsigned short int logversion;
struct ata_smart_log_entry entry[255];
@@ -478,7 +465,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_log_direc
@@ -494,7 +481,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_log_direc
// SMART SELECTIVE SELF-TEST LOG Table 61 of T13/1532D Volume 1
// Revision 3
@ -112,7 +112,7 @@
struct test_span {
uint64_t start;
uint64_t end;
@@ -486,7 +472,6 @@ struct test_span {
@@ -502,7 +488,6 @@ struct test_span {
#pragma pack()
ASSERT_SIZEOF_STRUCT(test_span, 16);

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

@ -8,47 +8,17 @@ minor exceptions
--- a/smartd.8.in
+++ b/smartd.8.in
@@ -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
-.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 #
@@ -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
+.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.
@@ -1689,6 +1697,10 @@ configuration file Directives might be:
If you want more frequent information, use:
.B -a.
@@ -161,6 +161,10 @@ below).
.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 ADDITIONAL DETAILS ABOUT DEVICESCAN
If a non-comment entry in the configuration file is the text
.B \-A PREFIX, \-\-attributelog=PREFIX
[ATA only] Writes \fBsmartd\fP attribute information (normalized and raw
--- a/smartd.conf
+++ b/smartd.conf
@@ -91,6 +91,12 @@ DEVICESCAN -n standby -m root -M exec /u
@ -66,7 +36,7 @@ minor exceptions
# self-tests Sundays between 1-2, 2-3, and 3-4 am.
--- a/smartd.conf.5.in
+++ b/smartd.conf.5.in
@@ -117,10 +117,11 @@ Section below!
@@ -132,10 +132,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
@ -82,7 +52,7 @@ minor exceptions
.B # device, four SATA disks connected to an Areca
.B # RAID controller, and one SATA disk.
.B #
@@ -189,6 +190,13 @@ Section below!
@@ -206,6 +207,13 @@ Section below!
.B \ \ /dev/twl0 -d 3ware,1 -a -s L/../../7/02
.B #
.nf
@ -96,7 +66,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.
@@ -1263,6 +1271,9 @@ configuration file Directives might be:
@@ -1431,6 +1439,9 @@ configuration file Directives might be:
If you want more frequent information, use:
.B -a.

13
debian/patches/manpage.diff vendored
View File

@ -1,18 +1,7 @@
Fixed example path in man pages
--- a/smartd.8.in
+++ b/smartd.8.in
@@ -1784,7 +1784,7 @@ sleep 30
.fi
Some example scripts are distributed with the smartmontools package,
-in /usr/local/share/doc/smartmontools/examplescripts/.
+in /usr/local/share/doc/smartmontools/examples/.
Please note that these scripts typically run as root, so any files
that they read/write should not be writable by ordinary users or
--- a/smartd.conf.5.in
+++ b/smartd.conf.5.in
@@ -1357,7 +1357,7 @@ sleep 30
@@ -1524,7 +1524,7 @@ sleep 30
.fi
Some example scripts are distributed with the smartmontools package,