summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2010-02-04 17:48:28 +0000
committerPascal Terjan <pterjan@mandriva.org>2010-02-04 17:48:28 +0000
commitc7bae412b06c9c9b6b9a66395720088128a61154 (patch)
tree06d1d5cac5743d615886cce4e44a0f80173a86cc /perl-install
parentda3f4555b210ba1ae0bc61c9c47828fdc01c5bae (diff)
downloaddrakx-backup-do-not-use-c7bae412b06c9c9b6b9a66395720088128a61154.tar
drakx-backup-do-not-use-c7bae412b06c9c9b6b9a66395720088128a61154.tar.gz
drakx-backup-do-not-use-c7bae412b06c9c9b6b9a66395720088128a61154.tar.bz2
drakx-backup-do-not-use-c7bae412b06c9c9b6b9a66395720088128a61154.tar.xz
drakx-backup-do-not-use-c7bae412b06c9c9b6b9a66395720088128a61154.zip
display lvm/dmraid/... name in combo box, and disable lvm for now
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/fs/partitioning_wizard.pm3
-rw-r--r--perl-install/install/NEWS2
2 files changed, 2 insertions, 3 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 6c2e8feca..573643bb3 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -9,7 +9,7 @@ Version 12.77.5 - 04 February 2010
- support ddf1 raid
- partitioning wizard:
o offer to install on dmraid (instead of crashing if no other disk)
- o offer to install on existing lvm
+ o display lvm/dmraid/... name in combo box
o suggest non-removable disks first
o unmount swap too when unmounting all partitions