diff options
Diffstat (limited to 'perl-install/fsedit.pm')
| -rw-r--r-- | perl-install/fsedit.pm | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index fee66e427..7e8fcf862 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -24,9 +24,6 @@ arch() =~ /^sparc/ ? ( { mntpoint => "/", size => 50 << 11, type => 0x83, ratio => 1, maxsize => 1000 << 11 }, { mntpoint => "swap", size => 30 << 11, type => 0x82, ratio => 1, maxsize => 500 << 11 }, ) : ( -arch() =~ /^i386/ ? ( - { mntpoint => "/boot", size => 16 << 11, type => 0x83, maxsize => 30 << 11 }, -) : (), { mntpoint => "/", size => 50 << 11, type => 0x83, ratio => 1, maxsize => 300 << 11 }, { mntpoint => "swap", size => 30 << 11, type => 0x82, ratio => 1, maxsize => 250 << 11 }, ), @@ -180,11 +177,11 @@ sub suggest_part($$$;$) { grep { !$part->{type} || $part->{type} == $_->{type} } @$suggestions or return; - if (arch() =~ /^i386/) { - $best = $second if - $best->{mntpoint} eq '/boot' && - $part->{start} + $best->{size} > 1024 * $hd->cylinder_size(); #- if the empty slot is beyond the 1024th cylinder, no use having /boot - } +#- if (arch() =~ /^i386/) { +#- $best = $second if +#- $best->{mntpoint} eq '/boot' && +#- $part->{start} + $best->{size} > 1024 * $hd->cylinder_size(); #- if the empty slot is beyond the 1024th cylinder, no use having /boot +#- } defined $best or return; #- sorry no suggestion :( @@ -238,10 +235,10 @@ sub check_mntpoint { has_mntpoint($mntpoint, $hds) and die _("There is already a partition with mount point %s", $mntpoint); - if ($part->{start} + $part->{size} > 1024 * $hd->cylinder_size() && arch() =~ /i386/) { - die "/boot ending on cylinder > 1024" if $mntpoint eq "/boot"; -# die "/ ending on cylinder > 1024" if $mntpoint eq "/" && !has_mntpoint("/boot", $hds); - } +#- if ($part->{start} + $part->{size} > 1024 * $hd->cylinder_size() && arch() =~ /i386/) { +#- die "/boot ending on cylinder > 1024" if $mntpoint eq "/boot"; +#- die "/ ending on cylinder > 1024" if $mntpoint eq "/" && !has_mntpoint("/boot", $hds); +#- } } sub add($$$;$) { |