diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-01-29 10:06:14 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-01-29 10:06:14 +0000 |
| commit | 9c265bfd2d328753cbd3c89ea30fb5787f769931 (patch) | |
| tree | 13226eb6364f3cde9a3e7116c09aa7a546075a2f | |
| parent | 8ea047ae780e20047ff2653f3aea9c9f90e0534d (diff) | |
| download | drakx-backup-do-not-use-9c265bfd2d328753cbd3c89ea30fb5787f769931.tar drakx-backup-do-not-use-9c265bfd2d328753cbd3c89ea30fb5787f769931.tar.gz drakx-backup-do-not-use-9c265bfd2d328753cbd3c89ea30fb5787f769931.tar.bz2 drakx-backup-do-not-use-9c265bfd2d328753cbd3c89ea30fb5787f769931.tar.xz drakx-backup-do-not-use-9c265bfd2d328753cbd3c89ea30fb5787f769931.zip | |
move the various bootloader::add_append's in setupBootloaderBefore
| -rw-r--r-- | perl-install/install_steps.pm | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 9e914bf87..7352b0476 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -778,6 +778,20 @@ sub readBootloaderConfigBeforeInstall { sub setupBootloaderBefore { my ($o) = @_; + + require bootloader; + if (my @l = detect_devices::IDEburners()) { + bootloader::add_append($o->{bootloader}, $_->{device}, 'ide-scsi') foreach @l; + #- in that case, also add ide-floppy otherwise ide-scsi will be used! + bootloader::add_append($o->{bootloader}, $_->{device}, 'ide-floppy') foreach detect_devices::ide_zips(); + } + if ($o->{miscellaneous}{HDPARM}) { + bootloader::add_append($o->{bootloader}, $_, 'autotune') foreach grep { /ide.*/ } all("/proc/ide"); + } + if (grep { /Athlon|Duron/ } cat_("/proc/cpuinfo")) { + bootloader::add_append($o->{bootloader}, 'mem', 'nopentium'); + } + if (arch() =~ /alpha/) { if (my $dev = fsedit::get_root($o->{fstab})) { $o->{bootloader}{boot} ||= "/dev/$dev->{rootDevice}"; @@ -803,7 +817,6 @@ sub setupBootloaderBefore { my $force_vga = $o->{allowFB} && (detect_devices::matching_desc('SiS.*630') #- SiS 630 need frame buffer. ); - require bootloader; #- propose the default fb mode for kernel fb, if aurora is installed too. my $has_aurora = do { my $p = pkgs::packageByName($o->{packages}, 'Aurora'); @@ -919,18 +932,6 @@ sub miscellaneousBefore { } sub miscellaneous { my ($o) = @_; - - if (my @l = detect_devices::IDEburners()) { - bootloader::add_append($o->{bootloader}, $_->{device}, 'ide-scsi') foreach @l; - #- in that case, also add ide-floppy otherwise ide-scsi will be used! - bootloader::add_append($o->{bootloader}, $_->{device}, 'ide-floppy') foreach detect_devices::ide_zips(); - } - if ($o->{miscellaneous}{HDPARM}) { - bootloader::add_append($o->{bootloader}, $_, 'autotune') foreach grep { /ide.*/ } all("/proc/ide"); - } - if (grep { /Athlon|Duron/ } cat_("/proc/cpuinfo")) { - bootloader::add_append($o->{bootloader}, 'mem', 'nopentium'); - } #- keep some given parameters #-TODO } |