summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2010-02-04 18:23:13 +0000
committerPascal Terjan <pterjan@mandriva.org>2010-02-04 18:23:13 +0000
commit5a4776f394cff781af61cc75968d44e363255b4e (patch)
tree311b456d498f3abe194fa103ff919ceaf49c9c3d
parent824f479b0460059def2471217e8723742b29bf84 (diff)
downloaddrakx-backup-do-not-use-5a4776f394cff781af61cc75968d44e363255b4e.tar
drakx-backup-do-not-use-5a4776f394cff781af61cc75968d44e363255b4e.tar.gz
drakx-backup-do-not-use-5a4776f394cff781af61cc75968d44e363255b4e.tar.bz2
drakx-backup-do-not-use-5a4776f394cff781af61cc75968d44e363255b4e.tar.xz
drakx-backup-do-not-use-5a4776f394cff781af61cc75968d44e363255b4e.zip
display lvm/dmraid/... name in combo box, and disable lvm for now
-rw-r--r--perl-install/fs/partitioning_wizard.pm3
-rw-r--r--perl-install/install/NEWS4
2 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index 21890ad91..d95f0a63b 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -504,7 +504,6 @@ sub main {
my @kinds = map { diskdrake::hd_gtk::hd2kind($_) } sort { $a->{is_removable} <=> $b->{is_removable} } @{$all_hds->{hds} };
push @kinds, map { diskdrake::hd_gtk::raid2kind($_) } @{$all_hds->{raids}};
- push @kinds, map { diskdrake::hd_gtk::lvm2kind($_) } @{$all_hds->{lvms}};
my $hdchoice = Gtk2::HBox->new;
@@ -512,7 +511,7 @@ sub main {
my $combobox = Gtk2::ComboBox->new_text;
foreach (@kinds) {
- my $info = $_->{val}{info};
+ my $info = $_->{val}{info} || $_->{val}{name};
$info .= " (" . formatXiB($_->{val}{totalsectors}, 512) . ")" if $_->{val}{totalsectors};
$combobox->append_text($info);
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 76646f446..a0a9ecfa3 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,7 @@
+- partitioning wizard:
+ o display lvm/dmraid name in combo box
+ o disable install on existing lvm, it breaks later
+
Version 13.10 - 4 February 2010
- handle new drivers: