r255 - in mdadm/trunk/debian: . patches

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-11-03 17:49:15 +0100 (Fri, 03 Nov 2006)
New Revision: 255

Added:
   mdadm/trunk/debian/patches/99-mdadm-manpage-e-default-note.dpatch
Modified:
   mdadm/trunk/debian/changelog
   mdadm/trunk/debian/mdadm.logcheck.violations
Log:
escalate disk failures in logcheck

Modified: mdadm/trunk/debian/changelog
===================================================================
--- mdadm/trunk/debian/changelog	2006-11-01 15:01:25 UTC (rev 254)
+++ mdadm/trunk/debian/changelog	2006-11-03 16:49:15 UTC (rev 255)
@@ -4,8 +4,10 @@
     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 at debian.org>  Wed,  1 Nov 2006 16:00:21 +0100
+ -- martin f. krafft <madduck at debian.org>  Fri,  3 Nov 2006 17:48:18 +0100
 
 mdadm (2.5.5-1) unstable; urgency=low
 

Modified: mdadm/trunk/debian/mdadm.logcheck.violations
===================================================================
--- mdadm/trunk/debian/mdadm.logcheck.violations	2006-11-01 15:01:25 UTC (rev 254)
+++ mdadm/trunk/debian/mdadm.logcheck.violations	2006-11-03 16:49:15 UTC (rev 255)
@@ -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\.$

Added: mdadm/trunk/debian/patches/99-mdadm-manpage-e-default-note.dpatch
===================================================================
--- mdadm/trunk/debian/patches/99-mdadm-manpage-e-default-note.dpatch	2006-11-01 15:01:25 UTC (rev 254)
+++ mdadm/trunk/debian/patches/99-mdadm-manpage-e-default-note.dpatch	2006-11-03 16:49:15 UTC (rev 255)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99-mdadm-manpage-e-default-note.dpatch by martin f. krafft <madduck at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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