summaryrefslogtreecommitdiffstats
path: root/perl-install/fs
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-11-08 10:03:06 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-11-08 10:03:06 +0000
commitac3b0497c8dd2f56b82fc735448b7b64915167a2 (patch)
tree6803c0cf5fae78b8ebb1452c52ebf46a8c66ed72 /perl-install/fs
parent4b2cda0f4442e2016afb61d494942e0299d0a714 (diff)
downloaddrakx-ac3b0497c8dd2f56b82fc735448b7b64915167a2.tar
drakx-ac3b0497c8dd2f56b82fc735448b7b64915167a2.tar.gz
drakx-ac3b0497c8dd2f56b82fc735448b7b64915167a2.tar.bz2
drakx-ac3b0497c8dd2f56b82fc735448b7b64915167a2.tar.xz
drakx-ac3b0497c8dd2f56b82fc735448b7b64915167a2.zip
log is mixed with valid data (bugzilla #19654)
Diffstat (limited to 'perl-install/fs')
-rw-r--r--perl-install/fs/dmraid.pm20
1 files changed, 18 insertions, 2 deletions
diff --git a/perl-install/fs/dmraid.pm b/perl-install/fs/dmraid.pm
index 4b317ef5e..a45a90405 100644
--- a/perl-install/fs/dmraid.pm
+++ b/perl-install/fs/dmraid.pm
@@ -46,7 +46,7 @@ sub _raid_devices_raw() {
chomp;
log::l("got: $_");
my %l; @l{qw(pv format vg level status size)} = split(':');
- \%l;
+ if_(defined $l{size}, \%l);
} call_dmraid('-ccr');
}
@@ -67,7 +67,7 @@ sub _sets_raw() {
chomp;
log::l("got: $_");
my %l; @l{qw(name size stride level status subsets devs spares)} = split(':');
- \%l;
+ if_(defined $l{spares}, \%l);
} call_dmraid('-ccs');
}
@@ -167,6 +167,22 @@ if ($ENV{DRAKX_DEBUG_DMRAID}) {
# ERROR: sil: only 3/4 metadata areas found on /dev/sdb, electing...
},
+ weird_nvidia => {
+ '-ccs' => <<'EO',
+/dev/sda: "sil" and "nvidia" formats discovered (using nvidia)!
+/dev/sdb: "sil" and "nvidia" formats discovered (using nvidia)!
+nvidia_bcjdbjfa:586114702:128:mirror:ok:0:2:0
+EO
+ '-ccr' => <<'EO',
+/dev/sda: "sil" and "nvidia" formats discovered (using nvidia)!
+/dev/sdb: "sil" and "nvidia" formats discovered (using nvidia)!
+/dev/sda:nvidia:nvidia_bcjdbjfa:mirror:ok:586114702:0
+/dev/sdb:nvidia:nvidia_bcjdbjfa:mirror:ok:586114702:0
+EO
+ # ERROR: multiple match for set nvidia_bcjdbjfa: nvidia_bcjdbjfa
+ },
+
+
);
*call_dmraid = sub {