diff options
author | Pascal Terjan <pterjan@gmail.com> | 2015-06-01 22:18:58 +0000 |
---|---|---|
committer | Pascal Terjan <pterjan@gmail.com> | 2015-06-03 22:59:57 +0000 |
commit | 765b1e22ea39a0fb32000e77a6c7f0fe116cd9ed (patch) | |
tree | b67392b9dee275ce04dcd748305c64fa9b3dde8e /perl-install/fs | |
parent | b6e862baada2150b90964a79fca55c2b36924b9d (diff) | |
download | drakx-765b1e22ea39a0fb32000e77a6c7f0fe116cd9ed.tar drakx-765b1e22ea39a0fb32000e77a6c7f0fe116cd9ed.tar.gz drakx-765b1e22ea39a0fb32000e77a6c7f0fe116cd9ed.tar.bz2 drakx-765b1e22ea39a0fb32000e77a6c7f0fe116cd9ed.tar.xz drakx-765b1e22ea39a0fb32000e77a6c7f0fe116cd9ed.zip |
only use current disk when auto partitioning, wiping disk, using free space (mga#16055)
Diffstat (limited to 'perl-install/fs')
-rw-r--r-- | perl-install/fs/partitioning_wizard.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index b222c0780..aa77acf89 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -104,7 +104,7 @@ sub partitionWizardSolutions { my @hds_rw = grep { !$_->{readonly} } @$hds; 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 } ]; + $solutions{free_space} = [ 30, N("Use free space"), sub { fsedit::auto_allocate($all_hds, $partitions, $o_target); 1 } ]; } else { push @wizlog, N("Not enough free space to allocate new partitions") . ": " . (@hds_can_add ? @@ -238,7 +238,7 @@ filesystem checks will be run on your next boot into Microsoft Windows®")) if $ partition_table::adjust_local_extended($hd, $part); partition_table::adjust_main_extended($hd); - fsedit::auto_allocate($all_hds, $partitions); + fsedit::auto_allocate($all_hds, $partitions, $hd); 1; }, \@ok_for_resize_fat ]; } @@ -264,7 +264,7 @@ filesystem checks will be run on your next boot into Microsoft Windows®")) if $ title => N("Partitioning"), interactive_help_id => 'takeOverHdConfirm' }) or return; fsedit::partition_table_clear_and_initialize($all_hds->{lvms}, $hd, $in); - fsedit::auto_allocate($all_hds, $partitions); + fsedit::auto_allocate($all_hds, $partitions, $hd); 1; } ]; } |