summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-04-20 18:22:13 +0000
committerThierry Vignaud <tv@mageia.org>2012-04-20 18:22:13 +0000
commit529f69b1360246c116dc62e729bc768e28d1cfaf (patch)
tree230d1bab1ded8f5dab8292d1c196683950ae7f32
parent448690f02ee29a5d633e890e09920a0adee386b2 (diff)
downloaddrakx-529f69b1360246c116dc62e729bc768e28d1cfaf.tar
drakx-529f69b1360246c116dc62e729bc768e28d1cfaf.tar.gz
drakx-529f69b1360246c116dc62e729bc768e28d1cfaf.tar.bz2
drakx-529f69b1360246c116dc62e729bc768e28d1cfaf.tar.xz
drakx-529f69b1360246c116dc62e729bc768e28d1cfaf.zip
(fs::partitioning_wizard::main) use newly introduced raid2real_kind() in
order to get data about RAID devices, thus fixing: - crashing on selecting a RAID device (calling first_usable_sector on undefined value in partition_table::get_normal_parts_and_holes()) - listing RAID devices (bug introduced in commit r265764 pterjan by on Feb 4 2010: "partitioning wizard: offer to install on dmraid and existing lvm") sadly we trade "calling method on undefined value" for "calling method on unblessed reference" (see next commit)
-rw-r--r--perl-install/fs/partitioning_wizard.pm2
-rw-r--r--perl-install/install/NEWS4
2 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index 5131c9a42..ee7253c65 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -504,7 +504,7 @@ sub main {
my $mainbox = Gtk2::VBox->new;
my @kinds = map { diskdrake::hd_gtk::hd2kind($_) } sort { $a->{is_removable} <=> $b->{is_removable} } @{ $all_hds->{hds} };
- push @kinds, diskdrake::hd_gtk::raid2kind() if @{$all_hds->{raids}};
+ push @kinds, diskdrake::hd_gtk::raid2real_kind($_) foreach @{$all_hds->{raids}};
push @kinds, map { diskdrake::hd_gtk::lvm2kind($_) } @{$all_hds->{lvms}};
my $hdchoice = Gtk2::HBox->new;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index c16156c65..3ff8c7803 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,7 @@
+- partitioning wizard:
+ o do not crash on selecting a RAID device
+ o fix listing RAID devices
+
Version 14.7 - 19 April 2012
- fix a crash when package state is empty (mga#5487)