Fix regexes in _filter_mkfs to understand xscsi device names.

diff --git a/common.filter b/common.filter
index effbd86e031f537bd98f5339abb6fa569acb9ed5..20cd862b0e54596631eb7d679e9766671d7c410f 100644 (file)
--- a/common.filter
+++ b/common.filter
@@ -150,7 +150,7 @@ _filter_mkfs()
 {
     set -
     perl -ne '
-    if (/^meta-data=([\w|\/]+)\s+isize=(\d+)\s+agcount=(\d+), agsize=(\d+) blks/) {
+    if (/^meta-data=([\w|\/.-]+)\s+isize=(\d+)\s+agcount=(\d+), agsize=(\d+) blks/) {
        print STDERR "ddev=$1\nisize=$2\nagcount=$3\nagsize=$4\n";
        print STDOUT "meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks\n";
     }
@@ -166,11 +166,11 @@ _filter_mkfs()
        print STDERR "dirversion=$1\ndirbsize=$2\n";
        print STDOUT "naming   =VERN bsize=XXX\n";
     }
-    if (/^log\s+=(internal log|[\w|\/]+)\s+bsize=(\d+)\s+blocks=(\d+)/) {
+    if (/^log\s+=(internal log|[\w|\/.-]+)\s+bsize=(\d+)\s+blocks=(\d+)/) {
        print STDERR "ldev=\"$1\"\nlbsize=$2\nlblocks=$3\n";
        print STDOUT "log      =LDEV bsize=XXX blocks=XXX\n";
     }
-    if (/^realtime\s+=([\w|\/]+)\s+extsz=(\d+)\s+blocks=(\d+), rtextents=(\d+)/) {
+    if (/^realtime\s+=([\w|\/.-]+)\s+extsz=(\d+)\s+blocks=(\d+), rtextents=(\d+)/) {
        print STDERR "rtdev=$1\nrtextsz=$2\nrtblocks=$3\nrtextents=$4\n";
        print STDOUT "realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX\n";
     }'