From f74c3b0afadaa40c9a784321029959a7fffdd0e6 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 24 Mar 2000 14:29:56 +0000
Subject: no_comment

---
 perl-install/install_steps.pm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'perl-install/install_steps.pm')

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 7d3b00e03..6ba76b965 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -112,7 +112,11 @@ sub selectInstallClass($@) {
     }}{$o->{installClass}};
 }
 #------------------------------------------------------------------------------
-sub setupSCSI { modules::load_thiskind('scsi') }
+sub setupSCSI { 
+    modules::load("ide-mod", 'prereq', 'options="' . detect_devices::hasHPT() . '"');
+    modules::load_multi(qw(ide-probe ide-disk ide-cd));
+    modules::load_thiskind('scsi');
+}
 #------------------------------------------------------------------------------
 sub doPartitionDisks($$) {
     my ($o, $hds) = @_;
@@ -243,7 +247,7 @@ sub installPackages($$) { #- complete REWORK, TODO and TOCHECK!
 sub afterInstallPackages($) {
     my ($o) = @_;
 
-    -x "$o->{prefix}/usr/bin/dumpkeys" or die 
+    -x "$o->{prefix}/usr/bin/dumpkeys" or $::testing or die 
 "Some important packages didn't get installed properly.
 
 Please switch to console 2 (using ctrl-alt-f2)
@@ -742,7 +746,9 @@ sub miscellaneous {
 	$_ .= " " . join(" ", map { "$_=ide-scsi" } @l);
     }
     #- keep some given parameters
-    $_ .= " " . join(" ", grep { /^ide/ } split ' ', cat_("/proc/cmdline")) unless /ide.=/;
+    if (my $m = modules::get_options("ide-mod")) {
+	/options="(.*)"/ and $_ .= " $1" if !/ide.=/;
+    }
 
     $o->{bootloader}{perImageAppend} = $_;
 }
-- 
cgit v1.2.1