summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Tokarev <mjt@tls.msk.ru>2012-04-12 23:12:30 +0400
committerMichael Tokarev <mjt@tls.msk.ru>2012-04-12 23:12:30 +0400
commit100f0933df71a44e61f289237611b567ec4a3c1a (patch)
tree04ebae913c4f7b8be98a83ef6b7e1a39360c9239 /debian
parent3228706ff8c7cef5a4ee9618900c96eba5cbb766 (diff)
update debian/mdadm.logcheck.ignore.server (k vs blocks) (#656038)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
-rw-r--r--debian/mdadm.logcheck.ignore.server2
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 651c6987..17f1dd7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ mdadm (3.2.3-3) UNRELEASED; urgency=low
debian/patches. Don't build-depend on quilt as patching
is done automatically by dpkg-source.
* debian/patches/debian-run-udev.diff by Roger Leigh (Closes: #644319, #627774)
+ * update debian/mdadm.logcheck.ignore.server to recognize "k" in
+ addition of "blocks" in kernel messages. Thanks to Frédéric Brière
+ for the patch (Closes: #656038)
-- Michael Tokarev <mjt@tls.msk.ru> Thu, 12 Apr 2012 22:35:36 +0400
diff --git a/debian/mdadm.logcheck.ignore.server b/debian/mdadm.logcheck.ignore.server
index 3d3d5a39..051c4732 100644
--- a/debian/mdadm.logcheck.ignore.server
+++ b/debian/mdadm.logcheck.ignore.server
@@ -10,7 +10,7 @@
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? md: minimum _guaranteed_ ?speed: [[:digit:]]+ KB/sec/disk\.$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? md: using maximum available idle IO bandwidth \(but not more than [[:digit:]]+ KB/sec\) for (data-check|requested-resync|resync|reshape|recovery)\.$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? md: delaying (data-check|requested-resync|resync|reshape|recovery) of md[[:digit:]]+ until md[[:digit:]]+ has finished \(they share one or more physical units\)$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? md: using [[:digit:]]+k window, over a total of [[:digit:]]+ blocks\.$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? md: using [[:digit:]]+k window, over a total of [[:digit:]]+( blocks|k)\.$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? md: (un)?bind<[^>]+>$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? md: export_rdev\([^)]+\)$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? raid[[:digit:]]+: raid set [[:alnum:]]+ active with [[:digit:]]+ out of [[:digit:]]+ mirrors$