From c371cfa72e473518a9ff0540b0b1d2eae83dd7aa Mon Sep 17 00:00:00 2001
From: maximilian attems <max@stro.at>
Date: Sat, 8 Sep 2007 22:33:12 +0200
Subject: hook-functions: Add sys_walk_modalias() for IDE

instead of searching non matching sysfs modules strings
PIIX_IDE != piix, just look up the modalias.
modprobe likes it too ;)
---
 hook-functions | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'hook-functions')

diff --git a/hook-functions b/hook-functions
index 628811b..9becfe2 100644
--- a/hook-functions
+++ b/hook-functions
@@ -200,6 +200,20 @@ sys_walk_mod_add()
 	done
 }
 
+# walk /sys for relevant modalias
+sys_walk_modalias()
+{
+	local device_path modalias
+
+	device_path="$(dirname "${1}")"
+	device_path="$(dirname "${device_path}")"
+	modalias=$(cat "${device_path}/modalias")
+
+	if [ -n "${modalias}" ]; then
+		force_load "${modalias}"
+	fi
+}
+
 # find and only copy root relevant modules
 dep_add_modules()
 {
@@ -251,13 +265,15 @@ dep_add_modules()
 		exit 1
 	fi
 
+	# sys walk ATA
 	root_dev_path=$(readlink -f /sys/block/${block}/device)
 	sys_walk_mod_add ${root_dev_path}
 
-	if [ -e /proc/ide ]; then
-		for x in ide-generic ide-disk ide-cd; do
-			manual_add_modules "${x}"
-		done
+	# catch old-style IDE
+	if [ -e /sys/bus/ide/devices/ ]; then
+		sys_walk_modalias ${root_dev_path}
+		manual_add_modules ide-disk
+		manual_add_modules ide-cd
 	fi
 
 	if [ -e /sys/bus/scsi/devices/ ]; then
-- 
cgit v1.2.3