mxraid_assemble: Add confidential RAIDs (C)

Note: this makes reported successor labels even more bogus ...
mariux64 · Aug 6, 2018 · 4409581 · 4409581
1 parent b3a7b2c
commit 4409581
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/mxraid/mxraid_assemble b/mxraid/mxraid_assemble
@@ -151,15 +151,15 @@ if ($opts{n}) {
   }
 
   # warn "#  NOTE: got $cnt disk(s), default is 16.\n" if $cnt != 16;
-  # warn "#  NOTE: label '$opts{n}' doesn't look good.\n" unless $opts{n} =~ m/^[DM][\da-f]\d{3}$/;
+  # warn "#  NOTE: label '$opts{n}' doesn't look good.\n" unless $opts{n} =~ m/^[CDM][\da-f]\d{3}$/;
   if ($cnt != 16) {
     my $msg = "got $cnt disk(s), default is 16.";
     $msg = $color->t_red($msg) unless $opts{m};
     print "#  NOTE: $msg\n";
   }
 
 
-  if ($opts{n} !~ m/^[DM][\da-f]\d{3}$/) {
+  if ($opts{n} !~ m/^[CDM][\da-f]\d{3}$/) {
     my $msg = "label '$opts{n}' doesn't look good.";
     $msg = $color->t_red($msg) unless $opts{m};
     print "#  NOTE: $msg\n";
@@ -386,7 +386,7 @@ exit;
 
       @rec = split m/\s+/, $_;
 
-      if ($rec[0] !~ m/[DM][\da-f]\d{3}:/) {
+      if ($rec[0] !~ m/[CDM][\da-f]\d{3}:/) {
         warn "#  NOTE: raid name not in expected format (bad key '$rec[0]' at line $lines).\n" if $self->{verbose} >= 1;
         next;
       }
@@ -454,7 +454,7 @@ exit;
     my $self = shift;
     my %tmp;
     for (keys %{$self->{db}}) {
-      my ($cat,$size,$num) = $_ =~ m/([DM])([\da-f])(\d{3})/;
+      my ($cat,$size,$num) = $_ =~ m/([CDM])([\da-f])(\d{3})/;
       next unless defined $cat and defined $num;
       if (exists $tmp{"$cat$size"} and $tmp{"$cat$size"} > $num) {
         $num = $tmp{"$cat$size"};