[Logcheck-commits] Frédéric Brière : i.d.w/kernel: adjusted " USB HID" rule to match generic devices

[Frédéric Brière]

Module: logcheck
Branch: master
Commit: 2655b29e85f3194bd541dc77fb106c4a6c234961
URL:    http://git.debian.org/?p=logcheck/logcheck.git;a=commit;h=2655b29e85f3194bd541dc77fb106c4a6c234961

Author: Frédéric Brière <fbriere at fbriere.net>
Date:   Thu Feb 18 21:46:08 2010 -0500

i.d.w/kernel: adjusted "USB HID" rule to match generic devices

Here's a sample log line (plugging a USB headset w/ 2.6.26):

  Dec  5 14:54:25 toroia kernel: [1741438.045094] input,hidraw0: USB HID v1.00 Device [HID 0d8c:000c] on usb-0000:00:07.3-1

---

 debian/changelog                            |    1 +
 rulefiles/linux/ignore.d.workstation/kernel |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 48c2615..ba544c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,7 @@ logcheck (1.3.7) UNRELEASED; urgency=low
     - added UDF-fs "readonly partition" and "Mounting volume" rules
     - usbhid no longer prints the source filename in its messages
     - allow ':' and arbitrary paths for input devices
+    - adjusted "USB HID" rule to match generic devices
 
  -- Hannes von Haugwitz <hannes at vonhaugwitz.com>  Sun, 31 Jan 2010 20:13:27 +0100
 
diff --git a/rulefiles/linux/ignore.d.workstation/kernel b/rulefiles/linux/ignore.d.workstation/kernel
index 31a44e9..54d443e 100644
--- a/rulefiles/linux/ignore.d.workstation/kernel
+++ b/rulefiles/linux/ignore.d.workstation/kernel
@@ -77,7 +77,7 @@
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? (drivers/usb/input/hid-core.c|usbhid): v[\:[:digit:].]+USB HID core driver$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? drivers/usb/class/cdc-acm.c: v[\:[:digit:].]+USB Abstract Control Model driver for USB modems and ISDN adapters$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ input.agent\[[[:digit:]]+\]:[[:space:]]+((mouse|ts|ev|joy)dev|evbug): (already loaded|loaded successfully|blacklisted)$
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? input: USB HID v[.[:digit:]]+ (Joystick|Keyboard|Mouse) \[[ [:alnum:][:punct:]]+\] on usb-[\:[:xdigit:].-]+$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? input(,hidraw[[:digit:]]+)?: USB HID v[.[:digit:]]+ (Joystick|Keyboard|Mouse|Device) \[[ [:alnum:][:punct:]]+\] on usb-[\:[:xdigit:].-]+$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? input: [-_/:[:alnum:][:space:]]+ as [-.:/[:alnum:]]+$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? input: AT Translated Set 2 keyboard on isa[[:digit:]]+/serio[[:digit:]]+$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? pl2303 [-:[:digit:].]+ PL-2303 converter detected$