From 768876a1861fb81696ae5455dca5685b77eddf58 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 19 Sep 2005 10:05:40 +0000 Subject: fs::proc_partitions::compare is no good for dmraid, but we need to check if we agree with the kernel, otherwise an uncatched error will occur (bugzilla #18655) --- perl-install/fsedit.pm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index 1df2f39c2..cd9b72f76 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -189,8 +189,15 @@ sub get_hds { partition_table::read($hd); if (listlength(partition_table::get_normal_parts($hd)) == 0) { $handled = 1 if $handle_die_and_cdie->(); - } else { - fs::proc_partitions::compare($hd) if !fs::type::is_dmraid($hd) && $::isInstall && !detect_devices::is_xbox(); + } elsif ($::isInstall) { + if (fs::type::is_dmraid($hd)) { + if (my $p = find { ! -e "/dev/$_->{device}" } partition_table::get_normal_parts($hd)) { + #- dmraid should have created the device, so it means we don't agree + die sprintf(q(bad dmraid (missing partition %s), you may try rebooting install with option "nodmraid"), $p->{device}); + } + } else { + fs::proc_partitions::compare($hd) if !detect_devices::is_xbox(); + } } } sub { my $err = $@; -- cgit v1.2.1