summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-09-23 09:22:28 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-09-23 09:22:28 +0000
commite82dd3d3859d1d2665e9f21ebb0c0c65da106894 (patch)
tree7b93797eaea814e05b49afe3b7555f4d1cfce19e /perl-install
parent713c67a8e05893ef953a2343b4624d470fedc1d0 (diff)
downloaddrakx-e82dd3d3859d1d2665e9f21ebb0c0c65da106894.tar
drakx-e82dd3d3859d1d2665e9f21ebb0c0c65da106894.tar.gz
drakx-e82dd3d3859d1d2665e9f21ebb0c0c65da106894.tar.bz2
drakx-e82dd3d3859d1d2665e9f21ebb0c0c65da106894.tar.xz
drakx-e82dd3d3859d1d2665e9f21ebb0c0c65da106894.zip
call fsedit::auto_allocate() with $o->{partitions} so be able to fix a partitioning scheme in a defcfg
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_interactive.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm
index 780cfc81d..971acd2d6 100644
--- a/perl-install/install_interactive.pm
+++ b/perl-install/install_interactive.pm
@@ -92,7 +92,7 @@ sub partitionWizardSolutions {
my @hds_rw = grep { !$_->{readonly} } @$hds;
my @hds_can_add = grep { $_->can_raw_add } @hds_rw;
if (fs::get::hds_free_space(@hds_can_add) > $min_linux) {
- $solutions{free_space} = [ 20, N("Use free space"), sub { fsedit::auto_allocate($all_hds); 1 } ]
+ $solutions{free_space} = [ 20, N("Use free space"), sub { fsedit::auto_allocate($all_hds, $o->{partitions}); 1 } ]
} else {
push @wizlog, N("Not enough free space to allocate new partitions") . ": " .
(@hds_can_add ?
@@ -201,7 +201,7 @@ filesystem checks will be run on your next boot into Windows(TM)")) if $part->{f
partition_table::adjust_local_extended($hd, $part);
partition_table::adjust_main_extended($hd);
- fsedit::auto_allocate($all_hds);
+ fsedit::auto_allocate($all_hds, $o->{partitions});
1;
} ];
} else {
@@ -219,7 +219,7 @@ filesystem checks will be run on your next boot into Windows(TM)")) if $part->{f
$o->ask_okcancel_({ messages => N("ALL existing partitions and their data will be lost on drive %s", partition_table::description($hd)),
interactive_help_id => 'takeOverHdConfirm' }) or return;
partition_table::raw::zero_MBR($hd);
- fsedit::auto_allocate($all_hds);
+ fsedit::auto_allocate($all_hds, $o->{partitions});
1;
} ];
}