summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2010-02-08 19:34:54 +0000
committerPascal Terjan <pterjan@mandriva.org>2010-02-08 19:34:54 +0000
commit374adf19288216f2e114b898c43e62dbf817fa19 (patch)
treed02a15f0ae3f238a858b7d769617181d768e8854
parentd631b34832cab37a569d9927c059d74c938a4c09 (diff)
downloaddrakx-backup-do-not-use-374adf19288216f2e114b898c43e62dbf817fa19.tar
drakx-backup-do-not-use-374adf19288216f2e114b898c43e62dbf817fa19.tar.gz
drakx-backup-do-not-use-374adf19288216f2e114b898c43e62dbf817fa19.tar.bz2
drakx-backup-do-not-use-374adf19288216f2e114b898c43e62dbf817fa19.tar.xz
drakx-backup-do-not-use-374adf19288216f2e114b898c43e62dbf817fa19.zip
Add back and fix lvm in patitioning wizard
-rw-r--r--perl-install/fs/partitioning_wizard.pm6
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/lvm.pm2
3 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index d95f0a63b..b71ea9384 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -87,7 +87,7 @@ sub partitionWizardSolutions {
# each solution is a [ score, text, function ], where the function retunrs true if succeeded
my @hds_rw = grep { !$_->{readonly} } @$hds;
- my @hds_can_add = grep { $_->can_add } @hds_rw;
+ my @hds_can_add = grep { $_->{type} ne 'hd' || $_->can_add } @hds_rw;
if (fs::get::hds_free_space(@hds_can_add) > $min_linux) {
$solutions{free_space} = [ 30, N("Use free space"), sub { fsedit::auto_allocate($all_hds, $partitions); 1 } ];
} else {
@@ -504,6 +504,7 @@ 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;
@@ -511,7 +512,8 @@ sub main {
my $combobox = Gtk2::ComboBox->new_text;
foreach (@kinds) {
- my $info = $_->{val}{info} || $_->{val}{name};
+ my $info = $_->{val}{info} || $_->{val}{device};
+ $info =~ s|^(?:.*/)?(.{24}).*|$1|;
$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 909dc2b26..8524da6a3 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,7 +1,7 @@
- add support for asturian (#56990)
- partitioning wizard:
o display lvm/dmraid name in combo box
- o disable install on existing lvm, it breaks later
+ o allow reusing existing partitions in lvm
Version 13.10 - 4 February 2010
diff --git a/perl-install/lvm.pm b/perl-install/lvm.pm
index 3205fa2fd..15fbe554a 100644
--- a/perl-install/lvm.pm
+++ b/perl-install/lvm.pm
@@ -17,7 +17,7 @@ sub new {
my ($class, $name) = @_;
$name =~ s/[^\w-]/_/g;
$name = substr($name, 0, 63); # max length must be < NAME_LEN / 2 where NAME_LEN is 128
- bless { disks => [], VG_name => $name }, $class;
+ bless { disks => [], VG_name => $name, device => $name }, $class;
}
sub use_pt_type { 0 }
sub hasExtended { 0 }