From 5a4776f394cff781af61cc75968d44e363255b4e Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mandriva.org>
Date: Thu, 4 Feb 2010 18:23:13 +0000
Subject: display lvm/dmraid/... name in combo box, and disable lvm for now

---
 perl-install/fs/partitioning_wizard.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'perl-install/fs')

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);
         }
-- 
cgit v1.2.1