Fix more filters that will fail on xscsi names

diff --git a/029 b/029
index 4828d77a442e3875af18fe0dbe85fad265932395..82b1541eb9538fbb33ed958afa15c640923a2ae4 100755 (executable)
--- a/029
+++ b/029
@@ -63,9 +63,9 @@ fi
 _filter_logprint()
 {
        perl -ne '
-           s/data device: ([\w|\/]+)/data device: DDEV/;
-           s/log device: ([\w|\/]+) daddr: (\d+) length: (\d+)/log device: LDEV daddr: XXX length: XXX/;
-           s/log file: "([\w|\/]+)" daddr: (\d+) length: (\d+)/log device: LDEV daddr: XXX length: XXX/;
+           s/data device: ([\w|\/.-]+)/data device: DDEV/;
+           s/log device: ([\w|\/.-]+) daddr: (\d+) length: (\d+)/log device: LDEV daddr: XXX length: XXX/;
+           s/log file: "([\w|\/.-]+)" daddr: (\d+) length: (\d+)/log device: LDEV daddr: XXX length: XXX/;
            s/skipped (\w+) zeroed blocks/skipped XXX zeroed blocks/;
             s/^uuid: *[0-9a-f-][0-9a-f-]* *format: *.*$/uuid: <UUID> format: <FORMAT>/;
            print;

diff --git a/044 b/044
index b994b7c35b7826e406d4088322213ac785c19478..8e47bd78fa17c3f112499057003e4c87d89ed3b4 100755 (executable)
--- a/044
+++ b/044
@@ -58,9 +58,9 @@ _require_logdev
 _filter_logprint()
 {
        perl -ne '
-           s/data device: ([\w|\/]+)/data device: DDEV/;
-           s/log device: ([\w|\/]+) daddr: (\d+) length: (\d+)/log device: LDEV daddr: XXX length: XXX/;
-           s/log file: "([\w|\/]+)" daddr: (\d+) length: (\d+)/log device: LDEV daddr: XXX length: XXX/;
+           s/data device: ([\w|\/.-]+)/data device: DDEV/;
+           s/log device: ([\w|\/.-]+) daddr: (\d+) length: (\d+)/log device: LDEV daddr: XXX length: XXX/;
+           s/log file: "([\w|\/.-]+)" daddr: (\d+) length: (\d+)/log device: LDEV daddr: XXX length: XXX/;
            s/uuid: ([abcdef\d-]+)\s+format: (.+)/uuid: UUID format: FORMAT/;
            s/skipped (\w+) zeroed blocks/skipped XXX zeroed blocks/;
            print;