summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authormadduck <madduck@3cfab66f-1918-0410-86b3-c06b76f9a464>2006-11-03 16:49:15 +0000
committermadduck <madduck@3cfab66f-1918-0410-86b3-c06b76f9a464>2006-11-03 16:49:15 +0000
commitb0649edbccd341e9da8facd7bb78377d65b573b4 (patch)
treec9cc619ab6168e0c453db177cb83b0835430cac9 /debian
parent5b22b1864eb6944715d35345ac3830800df0c1ee (diff)
escalate disk failures in logcheck
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rw-r--r--debian/mdadm.logcheck.violations1
-rw-r--r--debian/patches/99-mdadm-manpage-e-default-note.dpatch25
3 files changed, 29 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 66698060..2c00e590 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ mdadm (2.5.5-2) unstable; urgency=low
array only has one drive left nicely by the mdadm-raid script.
* Updated Japanese debconf translation; thanks to Hideki Yamane
(closes: #396400).
+ * Added note to mdadm(8)/--metadata about overriding the default in
+ mdadm.conf (closes: #396914).
- -- martin f. krafft <madduck@debian.org> Wed, 1 Nov 2006 16:00:21 +0100
+ -- martin f. krafft <madduck@debian.org> Fri, 3 Nov 2006 17:48:18 +0100
mdadm (2.5.5-1) unstable; urgency=low
diff --git a/debian/mdadm.logcheck.violations b/debian/mdadm.logcheck.violations
index 5ebd3c1c..9f9e46cd 100644
--- a/debian/mdadm.logcheck.violations
+++ b/debian/mdadm.logcheck.violations
@@ -1 +1,2 @@
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ kernel: md: kicking non-fresh [[:alnum:]]+ from array!$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ kernel: raid[[:digit:]]+: Disk failure on [[:alnum:]]+, disabling device\.$
diff --git a/debian/patches/99-mdadm-manpage-e-default-note.dpatch b/debian/patches/99-mdadm-manpage-e-default-note.dpatch
new file mode 100644
index 00000000..99314804
--- /dev/null
+++ b/debian/patches/99-mdadm-manpage-e-default-note.dpatch
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99-mdadm-manpage-e-default-note.dpatch by martin f. krafft <madduck@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad trunk~/mdadm.8 trunk/mdadm.8
+--- trunk~/mdadm.8 2006-10-23 07:51:57.000000000 +0200
++++ trunk/mdadm.8 2006-11-03 17:05:31.000000000 +0100
+@@ -272,7 +272,13 @@
+ .TP
+ .B -e ", " --metadata=
+ Declare the style of superblock (raid metadata) to be used. The
+-default is 0.90 for --create, and to guess for other operations.
++default is 0.90 for --create, and to guess for other operations. The default
++can be overridden by setting the
++.B metadata
++value for the
++.B CREATE
++keyword in
++.BR mdadm.conf .
+
+ Options are:
+ .RS