diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-01-28 18:18:31 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-01-28 18:18:31 +0000 |
| commit | f7e80813769b5abaffc05e5ff6c71bb941f689ec (patch) | |
| tree | b69417ff496e7956953d473c05be67c64cbad709 /perl-install/install_steps.pm | |
| parent | 786aa9bcfa26bccfce2cdbbd4a26529b60db24f8 (diff) | |
| download | drakx-backup-do-not-use-f7e80813769b5abaffc05e5ff6c71bb941f689ec.tar drakx-backup-do-not-use-f7e80813769b5abaffc05e5ff6c71bb941f689ec.tar.gz drakx-backup-do-not-use-f7e80813769b5abaffc05e5ff6c71bb941f689ec.tar.bz2 drakx-backup-do-not-use-f7e80813769b5abaffc05e5ff6c71bb941f689ec.tar.xz drakx-backup-do-not-use-f7e80813769b5abaffc05e5ff6c71bb941f689ec.zip | |
cleanup perImageAppend code (hopefully handling nicely the mem=nopentium case)
Diffstat (limited to 'perl-install/install_steps.pm')
| -rw-r--r-- | perl-install/install_steps.pm | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index a344d852d..882a17d41 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -920,24 +920,19 @@ sub miscellaneousBefore { sub miscellaneous { my ($o) = @_; - local $_ = $o->{bootloader}{perImageAppend}; - - if (my @l = detect_devices::IDEburners() and !/ide-scsi/) { - $_ .= " " . join(" ", (map { "$_->{device}=ide-scsi" } @l), - #- in that case, also add ide-floppy otherwise ide-scsi will be used! - map { "$_->{device}=ide-floppy" } detect_devices::ide_zips()); + if (my @l = detect_devices::IDEburners()) { + add_append($o->{bootloader}, $_->{device}, 'ide-scsi') foreach @l; + #- in that case, also add ide-floppy otherwise ide-scsi will be used! + add_append($o->{bootloader}, $_->{device}, 'ide-floppy') foreach detect_devices::ide_zips(); } if ($o->{miscellaneous}{HDPARM}) { - $_ .= join('', map { " $_=autotune" } grep { /ide.*/ } all("/proc/ide")) if !/ide.=autotune/; + add_append($o->{bootloader}, $_, 'autotune') foreach grep { /ide.*/ } all("/proc/ide"); } if (grep { /Athlon|Duron/ } cat_("/proc/cpuinfo")) { - $_ .= " mem=nopentium"; + add_append($o->{bootloader}, 'mem', 'nopentium'); } #- keep some given parameters #-TODO - - log::l("perImageAppend: $_"); - $o->{bootloader}{perImageAppend} = $_; } #------------------------------------------------------------------------------ |