summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-03-01 14:39:02 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-03-01 14:39:02 +0000
commit117af841e3338899d2c5f9d84abb7e8c4c322614 (patch)
tree8b2c219bf2258fe214b0c53229d24a31a5c96bc6
parentb2cad65bfaf2f3515b8c9c917e7b0c99481cf4b7 (diff)
downloaddrakx-117af841e3338899d2c5f9d84abb7e8c4c322614.tar
drakx-117af841e3338899d2c5f9d84abb7e8c4c322614.tar.gz
drakx-117af841e3338899d2c5f9d84abb7e8c4c322614.tar.bz2
drakx-117af841e3338899d2c5f9d84abb7e8c4c322614.tar.xz
drakx-117af841e3338899d2c5f9d84abb7e8c4c322614.zip
remove existing xxx=ide-scsi on upgrades
-rw-r--r--perl-install/install_steps.pm7
1 files changed, 7 insertions, 0 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 58bc58ca2..592d4073d 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -803,6 +803,13 @@ sub setupBootloaderBefore {
my ($o) = @_;
require bootloader;
+
+ #- remove previous ide-scsi lines
+ bootloader::modify_append($o->{bootloader}, sub {
+ my ($_simple, $dict) = @_;
+ @$dict = grep { $_->[1] ne 'ide-scsi' } @$dict;
+ });
+
if ($o->{miscellaneous}{HDPARM}) {
bootloader::set_append($o->{bootloader}, $_, 'autotune') foreach grep { /ide/ } all("/proc/ide");
}