Ticket #362: mindi-kern.patch

(a) old-mindi vs. (b) mindi

@@ -751 +751 @@
 
 
 ListKernelModulePaths() {
-    local module_list module fname oss r kern
+    local module_list module fname oss r kern path regexp dash_fudging
+    local unique_list
     oss="/root/oss/modules"
     module_list="$MODULES"
     # Remove unwanted modules from list
@@ -772 +773 @@
 ###
 ### Sq-Mod End
 ###
-    for module in $module_list $EXTRA_MODS ; do
+    # Get rid of duplicates, so that if a live kernel module also appears
+    # in $EXTRA_MODS that it won't get reported as "live module file not
+    # found" twice.
+    unique_list="`echo $module_list $EXTRA_MODS | tr ' ' '\n'`"
+    unique_list="`echo "$unique_list" | sort -u`"
+    for module in $unique_list ; do
+        dash_fudging=0
         r=`find /lib/modules/$kern -type f | grep "/${module}\..*o" | tail -n1`
-        echo "module $module --> $r" >> $LOGFILE
+        # For some modules on some systems, the module name uses a '_', but
+        # the module file uses a '-'.
+        if [ -z "$r" ] && [[ $module == *_* ]]; then
+            regexp="`echo $module | sed s/_/[_-]/g`"
+            r=`find /lib/modules/$kern -type f | grep "/${regexp}\..*o" | tail -n1`
+            if [ "$r" ]; then
+                dash_fudging=1
+            fi
+        fi
+        path="$r"
+        if [ -z "$path" ]; then
+            if [ "`echo "$LIVE_MODULES" | grep ^${module}$`" ]; then
+                path="[live module file not found]"
+            else
+                path="[extra module file not found]"
+            fi
+        fi
+        echo "module $module --> $path" >> $LOGFILE
+        if [ $dash_fudging -eq 1 ]; then
+            echo "NOTE: Some of the '_'s in module $module are '-'s in the file name" >> $LOGFILE
+        fi
         [ "$r" ] && echo "$r"
         [ -f "$oss" ] && find $oss | grep -F $module
     done
@@ -2563 +2590 @@
     /usr/sbin/esxcfg-module -l >> $LOGFILE
     MODULES="$MODULES `/usr/sbin/esxcfg-module -l | awk '{print $1}'`"
 fi
+LIVE_MODULES="$MODULES"
 echo "FORCE_MODS:" >> $LOGFILE
 echo "-------------" >> $LOGFILE
 echo $FORCE_MODS >> $LOGFILE