From 38ea2e1819f88544f0c73ad8b30c6ea0de0bd03b Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Mon, 2 Oct 2000 15:39:00 +0000
Subject: *** empty log message ***

---
 perl-install/ChangeLog         | 5 +++++
 perl-install/detect_devices.pm | 4 +---
 perl-install/install_steps.pm  | 2 +-
 perl-install/modules.pm        | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 87d125140..6527b567c 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -2,6 +2,11 @@
 
 	* install_steps.pm: fixed installation of urpmi configuration.
 
+	* detect_devices.pm: updated comment about UltraDMA66/100
+	management.
+
+	* modules.pm: updated comment about UltraDMA66/100 management.
+
 2000-10-02  Pixel  <pixel@mandrakesoft.com>
 
 	* any.pm (addUsers): grpuser output goes to Mr Dave
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index b937eca48..6e9852b45 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -226,11 +226,9 @@ sub hasUsbZip { hasUsb(8, -1) }
 sub hasSMP { c::detectSMP() }
 
 sub hasUltra66 {
+    #- keep it BUT DO NOT USE IT as now included in kernel.
     cat_("/proc/cmdline") =~ /(ide2=(\S+)(\s+ide3=(\S+))?)/ and return $1;
 
-#    #- disable hasUltra66 (now included in kernel)
-#    return;
-
     my @l = map { $_->{verbatim} } matching_desc('HPT|Ultra66') or return;
     
     my $ide = sprintf "ide2=0x%x,0x%x ide3=0x%x,0x%x",
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 34c38e57d..ece51df5c 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -830,7 +830,7 @@ sub miscellaneous {
 	$_ .= join('', map { " $_=autotune" } grep { /ide.*/ } all("/proc/ide")) if !/ide.=autotune/;
     }
     if (my $m = detect_devices::hasUltra66()) {
-	#$_ .= " $m" if !/ide.=0x/;
+	#$_ .= " $m" if !/ide.=0x/; #- add it back to support Ultra66 on ide modules.
     }
 
     #- keep some given parameters
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 571377836..909b09844 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -612,6 +612,7 @@ sub get_that_type {
 }
 
 sub load_ide {
+    return; #- add it back to support Ultra66 on ide modules.
     eval {
 	load("ide-mod", 'prereq', 'options="' . detect_devices::hasUltra66() . '"');
 	delete $conf{"ide-mod"}{options};
-- 
cgit v1.2.1