Merge pull request #210 from mariux64/add-new-JBOD-label

make-automaps: add new JBOD label M[a-z]\d\d\d
mariux64 · Sep 23, 2021 · 05aa769 · 05aa769
2 parents a3625d6 + 69e3323
commit 05aa769
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/make-automaps/make-automaps b/make-automaps/make-automaps
@@ -47,7 +47,7 @@ sub parse_jbod_line {
 			return join(' ',$1,server_vers_opt($2),"$2:/amd/$2/X/$1");
 		} elsif ($in=~m"^(C\d+)\s+host==([^;]+);type:=link;fs:=/amd/\2/C/\1 host!=\2;type:=nfs;rhost:=\2;fs:=/amd/\2/c/\1;rfs:=/amd/\2/C/\1$") {
 			return join(' ',$1,server_vers_opt($2),"$2:/amd/$2/C/$1");
-		} elsif ($in=~m"^(M\d+)\s+host==([^;]+);type:=link;fs:=/amd/\2/M/\1 host!=\2;type:=nfs;rhost:=\2;fs:=/amd/\2/m/\1;rfs:=/amd/\2/M/\1$") {
+		} elsif ($in=~m"^(M[\da-z]\d{3})\s+host==([^;]+);type:=link;fs:=/amd/\2/M/\1 host!=\2;type:=nfs;rhost:=\2;fs:=/amd/\2/m/\1;rfs:=/amd/\2/M/\1$") {
 			return join(' ',$1,server_vers_opt($2),"$2:/amd/$2/M/$1");
 		} elsif ($in=~m"^(X\d+)\s+-fs:=/amd/([^/]+)/X/\1 host==\2;type:=link host!=\2;type:=nfs;rhost:=\2") {
 			return join(' ',$1,server_vers_opt($2),"$2:/amd/$2/X/$1");
@@ -201,4 +201,3 @@ create_pkg_map();
 close O;
 
 -e "/var/run/autofs-running" and system "kill -HUP `cat /var/run/autofs-running`";
-