From 4409581a382d1ce05d3757c51e024c1565b6fa85 Mon Sep 17 00:00:00 2001 From: thomas Date: Mon, 6 Aug 2018 09:15:21 +0200 Subject: [PATCH] mxraid_assemble: Add confidential RAIDs (C) Note: this makes reported successor labels even more bogus ... --- mxraid/mxraid_assemble | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mxraid/mxraid_assemble b/mxraid/mxraid_assemble index b665761..18cae2f 100755 --- a/mxraid/mxraid_assemble +++ b/mxraid/mxraid_assemble @@ -151,7 +151,7 @@ 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}; @@ -159,7 +159,7 @@ if ($opts{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"};