diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/ChangeLog | 13 | ||||
| -rw-r--r-- | perl-install/fsedit.pm | 21 | ||||
| -rw-r--r-- | perl-install/install2.pm | 8 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 2 |
4 files changed, 25 insertions, 19 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index c4f4418f7..88a96d74e 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,5 +1,18 @@ 2000-02-23 Pixel <pixel@mandrakesoft.com> + * install2.pm (%suggestedPartitions): remove any /boot entries + * install2.pm (selectInstallClass): removed the special code to + /boot entries from suggestedPartitions for on non-intel (and it + was buggy :) + * fsedit.pm (@suggestions): remove the /boot entry + * fsedit.pm (check_mntpoint): remove the 1024 cylinder check + * fsedit.pm (suggest_part): remove the 1024 cylinder special case + + * install_steps_interactive.pm (setupLILO): replace linear option + by lba32 + + * lilo.pm (suggest): add lba32 by default + * install_steps_interactive.pm (load_thiskind): moved the HPT stuff to install_any::ultra66 and call it. Add sound card configuration (3 lines :) 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($$$;$) { diff --git a/perl-install/install2.pm b/perl-install/install2.pm index cfb40c913..23478df31 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -111,20 +111,17 @@ arch() =~ /^sparc/ ? ( ], ) : ( normal => [ - { mntpoint => "/boot", size => 10 << 11, type => 0x83, maxsize => 30 << 11 }, { mntpoint => "/", size => 300 << 11, type => 0x83, ratio => 5, maxsize => 2500 << 11 }, { mntpoint => "swap", size => 64 << 11, type => 0x82, ratio => 1, maxsize => 250 << 11 }, { mntpoint => "/home", size => 300 << 11, type => 0x83, ratio => 2 }, ], developer => [ - { mntpoint => "/boot", size => 10 << 11, type => 0x83, maxsize => 30 << 11 }, { mntpoint => "swap", size => 64 << 11, type => 0x82, ratio => 1, maxsize => 250 << 11 }, { mntpoint => "/", size => 150 << 11, type => 0x83, ratio => 1, maxsize => 300 << 11 }, { mntpoint => "/usr", size => 300 << 11, type => 0x83, ratio => 4, maxsize =>1500 << 11 }, { mntpoint => "/home", size => 100 << 11, type => 0x83, ratio => 5 }, ], server => [ - { mntpoint => "/boot", size => 10 << 11, type => 0x83, maxsize => 30 << 11 }, { mntpoint => "swap", size => 64 << 11, type => 0x82, ratio => 2, maxsize => 400 << 11 }, { mntpoint => "/", size => 150 << 11, type => 0x83, ratio => 1, maxsize => 250 << 11 }, { mntpoint => "/usr", size => 300 << 11, type => 0x83, ratio => 3, maxsize =>1500 << 11 }, @@ -141,7 +138,7 @@ arch() =~ /^sparc/ ? ( #-the variable $default) #-####################################################################################### $o = $::o = { -# bootloader => { linear => 0, message => 1, timeout => 5, restricted => 0 }, +# bootloader => { linear => 0, lba32 => 1, message => 1, timeout => 5, restricted => 0 }, autoSCSI => 0, mkbootdisk => 1, #- no mkbootdisk if 0 or undef, find a floppy with 1, or fd1 #- packages => [ qw() ], @@ -267,8 +264,7 @@ sub selectPath { sub selectInstallClass { $o->selectInstallClass(@install_classes); - $o->{partitions} ||= - [ grep { arch() =~ /i386/ && $_->{mntpoint} ne "/boot" } @{$suggestedPartitions{$o->{installClass}}} ]; + $o->{partitions} ||= $suggestedPartitions{$o->{installClass}}; if ($o->{steps}{choosePackages}{entered} >= 1 && !$o->{steps}{doInstallStep}{done}) { $o->setPackages(\@install_classes); diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 78b5f68c3..93add6ea7 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -718,7 +718,7 @@ sub setupLILO { my @l = ( _("Boot device") => { val => \$b->{boot}, list => [ map { "/dev/$_" } (map { $_->{device} } @{$o->{hds}}, @{$o->{fstab}}), detect_devices::floppies ], not_edit => !$::expert }, -_("Linear (needed for some SCSI drives)") => { val => \$b->{linear}, type => "bool", text => _("linear") }, +_("LBA (doesn't work on old BIOSes)") => { val => \$b->{lba32}, type => "bool", text => "lba" }, _("Compact") => { val => \$b->{compact}, type => "bool", text => _("compact") }, _("Delay before booting default image") => \$b->{timeout}, _("Video mode") => { val => \$b->{vga}, list => [ keys %lilo::vga_modes ], not_edit => $::beginner }, |