consolidate in correct file

diff --git a/files/etc/logcheck/ignore.d.server/local-dhclient b/files/etc/logcheck/ignore.d.server/local-dhclient
index 7c7f7d2e613f28d0fe06d00215e1141246656db4..08d3a2d16b72fe1e7d7927b8fbc00fe6f017d958 100644 (file)
--- a/files/etc/logcheck/ignore.d.server/local-dhclient
+++ b/files/etc/logcheck/ignore.d.server/local-dhclient
@@ -1,2 +1,4 @@
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\]: DHCPREQUEST for [[:digit:].]+ on [[:alnum:].]+ to [[:digit:].]+ port 67$
-
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\]: DHCPREQUEST for [[:xdigit:]:.]+ on [[:alnum:].]+ to [[:xdigit:]:.]+ port 67$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\]: PRC: Renewing lease on [[:alnum:]]+\.$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\]: XMT: Renew on [[:alnum:]]+, interval [[:digit:]]+ms\.$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\]: RCV: Reply message on [[:alnum:]]+ from [[:xdigit:]:]+\.$

diff --git a/files/etc/logcheck/ignore.d.workstation/local-dhclient b/files/etc/logcheck/ignore.d.workstation/local-dhclient
deleted file mode 100644 (file)
index 129ff81..0000000
--- a/files/etc/logcheck/ignore.d.workstation/local-dhclient
+++ /dev/null
@@ -1,4 +0,0 @@
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\]: DHCPREQUEST for [[:xdigit:]:.]+ on [[:alnum:]]+ to [[:xdigit:]:.]+ port 67$
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\]: PRC: Renewing lease on [[:alnum:]]+\.$
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\]: XMT: Renew on [[:alnum:]]+, interval [[:digit:]]+ms\.$
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\]: RCV: Reply message on [[:alnum:]]+ from [[:xdigit:]:]+\.$