diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2009-10-13 16:38:47 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2009-10-13 16:38:47 +0000 |
| commit | 4356d7db3eb9415a943d0943f6fe1ce1d458feb4 (patch) | |
| tree | a7f8fa80db61fed6a8a2ca9a75c62ac3652388da /perl-install | |
| parent | 43988908dc63e239e39069bb9c3142c8adff31a0 (diff) | |
| download | drakx-4356d7db3eb9415a943d0943f6fe1ce1d458feb4.tar drakx-4356d7db3eb9415a943d0943f6fe1ce1d458feb4.tar.gz drakx-4356d7db3eb9415a943d0943f6fe1ce1d458feb4.tar.bz2 drakx-4356d7db3eb9415a943d0943f6fe1ce1d458feb4.tar.xz drakx-4356d7db3eb9415a943d0943f6fe1ce1d458feb4.zip | |
allow using existing partition on all disks (#54478)
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/fs/partitioning_wizard.pm | 8 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 97dc948c3..bebd86451 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- partitioning wizard: + o allow using existing partition on all disks (#54478) + Version 12.64 - 12 October 2009 - run_program layer: diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index 84576ad6f..531f50ed9 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -67,14 +67,14 @@ Then choose action ``Mount point'' and set it to `/'"), 1) or return; sub partitionWizardSolutions { my ($in, $all_hds, $all_fstab, $manual_fstab, $partitions, $partitioning_flags, $skip_mtab, $target) = @_; - my $hds; + my $hds = $all_hds->{hds}; my $fstab; + my $full_fstab = [ fs::get::fstab($all_hds) ]; if($target) { $hds = [ $target ]; $fstab = [ grep { $_->{rootDevice} eq $target->{device} } fs::get::fstab($all_hds) ]; } else { - $hds = $all_hds->{hds}; - $fstab = [ fs::get::fstab($all_hds) ]; + $fstab = $full_fstab; } my @wizlog; @@ -101,7 +101,7 @@ sub partitionWizardSolutions { if (my @truefs = grep { isTrueLocalFS($_) } @$fstab) { #- value twice the ext2 partitions - $solutions{existing_part} = [ 20 + @truefs + @$fstab, N("Use existing partitions"), sub { fs::mount_point::ask_mount_points($in, $fstab, $all_hds) } ]; + $solutions{existing_part} = [ 20 + @truefs + @$fstab, N("Use existing partitions"), sub { fs::mount_point::ask_mount_points($in, $full_fstab, $all_hds) } ]; } else { push @wizlog, N("There is no existing partition to use"); } diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 69bd7aa4c..33da0f2b4 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,6 @@ - do not call obsolete Xconfig::default::config_keyboard function (#54541) +- partitioning wizard: + o allow using existing partition on all disks (#54478) Version 12.64 - 12 October 2009 |