summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-04-17 22:59:53 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-04-17 22:59:53 +0000
commit7d8c8f8b00a34baadfd02dfd098f864591253716 (patch)
treec10d1485869e70c3ce98bb47686e8d210e2b2f6a /perl-install/install_steps.pm
parent4ac24b5f0541ab6a18278a12aeb1cb10bf61c27f (diff)
downloaddrakx-7d8c8f8b00a34baadfd02dfd098f864591253716.tar
drakx-7d8c8f8b00a34baadfd02dfd098f864591253716.tar.gz
drakx-7d8c8f8b00a34baadfd02dfd098f864591253716.tar.bz2
drakx-7d8c8f8b00a34baadfd02dfd098f864591253716.tar.xz
drakx-7d8c8f8b00a34baadfd02dfd098f864591253716.zip
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm11
1 files changed, 6 insertions, 5 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 7ca9537dc..256f37122 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -130,9 +130,9 @@ sub doPartitionDisks {
my $handle = loopback::inspect($real_part, '', 'rw') or die _("This partition can't be used for loopback");
my $size = loopback::getFree($handle->{dir}, $real_part);
- my $max_linux = 250 << 11; $max_linux *= 10 if $::expert;
- my $min_linux = 200 << 11; $max_linux /= 3 if $::expert;
- my $min_freewin = 100 << 11;
+ my $max_linux = 1000 << 11; $max_linux *= 10 if $::expert;
+ my $min_linux = 300 << 11; $max_linux /= 3 if $::expert;
+ my $min_freewin = 100 << 11; $min_freewin = 0 if $::expert;
my $swap = { type => 0x82, loopback_file => '/lnx4win/swapfile', mntpoint => 'swap', size => 64 << 11, device => $real_part, notFormatted => 1 };
my $root = { type => 0x83, loopback_file => '/lnx4win/linuxsys.img', mntpoint => '/', size => 0, device => $real_part, notFormatted => 1 };
@@ -189,8 +189,9 @@ sub choosePartitionsToFormat($$) {
foreach (@$fstab) {
$_->{mntpoint} = "swap" if isSwap($_);
$_->{mntpoint} or next;
-
- unless ($_->{toFormat} = $_->{notFormatted} || $o->{partitioning}{autoformat}) {
+
+ add2hash_($_, { toFormat => $_->{notFormatted} || $o->{partitioning}{autoformat} });
+ if (!$_->{toFormat}) {
my $t = isLoopback($_) ?
eval { fsedit::typeOfPart($o->{prefix} . loopback::file($_)) } :
fsedit::typeOfPart($_->{device});