From 94950b4937e70588f28ac27482027ee60a127c22 Mon Sep 17 00:00:00 2001
From: Brad House <brad_mssw@gentoo.org>
Date: Fri, 30 Jan 2004 03:04:57 +0000
Subject: [PATCH] modprobe fixes, and scsi module updates for x86_64

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@65 67a159dc-881f-0410-a524-ba9dfbe2cb84
---
 generic/modprobe    | 31 ++++++++++++++++++++++++++-----
 x86_64/modules_load | 28 ++++++++++++++++------------
 2 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/generic/modprobe b/generic/modprobe
index ceffdc7..7d08440 100755
--- a/generic/modprobe
+++ b/generic/modprobe
@@ -86,6 +86,11 @@ real_mod_path()
 modprobe2()
 {
 	local x
+	local deps
+	local real_path
+	local modlist
+	local ret
+
 	if [ "$#" != "1" ]
 	then
 		echo "modprobe(): improper usage"
@@ -104,28 +109,32 @@ modprobe2()
 	else
 		deps=""
 	fi
-#	echo ""
 #	echo "$1 -- DEPS='${deps}'"
 	# Make sure we don't do any endless loops!
 
 	LOADED_MODULES="${LOADED_MODULES} ${1}"
-
 	for x in ${deps}
 	do
 		if ! is_module_already_loaded ${x}
 		then
 			if [ "${x}" != "" -a "${x}" != " " ]
 			then
+#				echo "loading dep: ${x}"
 				modprobe2 "${x}"
 			fi
 		else
-			echo "skipping ${x}, module already loaded by us"
+			filler=1
+#			echo "skipping ${x}, module already loaded by us"
 		fi
 	done
 #	echo "running insmod on '${real_path}'"
 	${INSMOD} ${real_path} > /dev/null 2>&1
-
-	return $?
+	ret=$?
+	if [ "$ret" -eq "0" ]
+	then
+		echo "module ${real_path} loaded"
+	fi
+	return $ret
 }
 
 
@@ -134,6 +143,18 @@ then
 	usage
 fi
 
+for x in `cat /modules.cache`
+do
+	LOADED_MODULES="${LOADED_MODULES} ${x}"
+done
+
 modprobe2 ${1}
+
+[ -f "/modules.cache" ] && rm -f /modules.cache > /dev/null 2>&1
+for x in ${LOADED_MODULES}
+do
+	echo $x >> /modules.cache
+done
+
 exit $?
 
diff --git a/x86_64/modules_load b/x86_64/modules_load
index 1a2d136..ff0daa6 100644
--- a/x86_64/modules_load
+++ b/x86_64/modules_load
@@ -1,15 +1,19 @@
-SCSI_MODULES="sd_mod sg sr_mod  \
-aic7xxx aic7xxx_old BusLogic \
-ncr53c8xx NCR53c406a \
-initio advansys  aha1740  aha1542  aha152x  \
-atp870u dtc eata fdomain gdth \
-megaraid pas16 pci2220i pci2000 psi240i \
-qlogicfas qlogicfc qlogicisp \
-seagate t128  tmscsim  u14-34f  ultrastor  wd7000  \
-a100u2w 3w-xxxx DAC960 NCR53c406a \
-aacraid sym53c8xx a100u2w cpqfc \
-dmx3191d dpt_i2o imm in2000 ips qla1280 \
-sim710 sym53c416"
+SCSI_MODULES="3w-xxxx dpt_i2o mptscsih mptctl aic79xx"
+#SCSI_MODULES="3w-xxxx sata_sil"
+#sata_sil sata_promise sata_via \
+#SCSI_MODULES="sd_mod sg sr_mod  \
+#aic7xxx aic7xxx_old BusLogic \
+#ncr53c8xx NCR53c406a \
+#initio advansys  aha1740  aha1542  aha152x  \
+#atp870u dtc eata fdomain gdth \
+#pas16 pci2220i pci2000 psi240i \
+#seagate t128  tmscsim  u14-34f  ultrastor  wd7000  \
+#3w-xxxx NCR53c406a \
+#sata_sil sata_via sata_promise"
+#sim710 sym53c416 \ 
+#sym53c8xx cpqfc \
+#dmx3191d dpt_i2o imm in2000 ips qla1280 \
+#qlogicfas qlogicfc qlogicisp \
 
 FIREWIRE_MODULES="ieee1394 ohci1394 sbp2"
 
-- 
2.26.2