--- trunk/mkinitrd-magellan/mkinitrd.in	2010/05/30 11:43:19	992
+++ trunk/mkinitrd-magellan/mkinitrd.in	2010/05/30 11:47:04	993
@@ -53,7 +53,8 @@
 verbose=""
 img_vers=""
 builtins=""
-modulefile=/etc/modules.conf
+modulefile="/etc/modules.conf"
+modprobeconf="/etc/modprobe.d/*"
 rc=0
 
 IMAGESIZE=4000
@@ -472,7 +473,6 @@
 ####### get modules ##########
 
 echo "Creating ${IMAGE_TYPE} initrd image"
-modulefile=/etc/modprobe.conf
 
 for n in ${PREMODS}
 do
@@ -768,7 +768,7 @@
 	module=$(echo ${MODULE} | sed "s|.*/||" | sed "s/.k\?o$//")
 	fullmodule=$(echo ${MODULE} | sed "s|.*/||")
 
-	options=$(sed -n -e "s/^options[     ][      ]*${module}[      ][      ]*//p" ${modulefile} 2>/dev/null)
+	options=$(sed -n -e "s/^options[     ][      ]*${module}[      ][      ]*//p" ${modprobeconf} 2>/dev/null)
 
 	if [ -n "${options}" ]
 	then