Re: Request for Testers - discover 2.0.2 packages

[Harald Dunkel <harald.dunkel@t-online.de>]

Jeff Bailey wrote:
> Can you use "sed -e 's/-/_/g'" ?  It's in /bin

New patch attached.


Regards

Harri

--- discover-modprobe.orig	2004-02-10 17:52:57.000000000 +0100
+++ discover-modprobe	2004-02-14 19:19:53.000000000 +0100
@@ -50,16 +50,6 @@
 EOF
 }
 
-# Determine if the module is already loaded
-is_loaded() {
-    module="$1"
-    if cut -d" " -f1 /proc/modules | grep -q "^${module}\$" ; then
-        true
-    else
-        false
-    fi
-}
-
 ###############################################################################
 
 nop=
@@ -109,13 +99,15 @@
         continue
     fi
 
-    if ! (modprobe -l ${module_name}.o | grep -q ${module_name}.o); then
+    x="${module_name//-/_}"
+    if ! (modprobe -l ${module_name} | sed -e 's/-/_/g' | grep -q -E "${x}\\.o\$|${x}\\.ko\$"); then
         ${verbose} && echo "Skipping ${module_name}; assuming it is compiled into the kernel."
         continue
     fi
 
-    if is_loaded ${module_name} ; then
-        echo "Skipping Module ${module_name}. It's already loaded." >&2
+    # Determine if the module is already loaded
+    if cut -d" " -f1 /proc/modules | sed -e 's/-/_/g' | grep -q "^${x}\$" ; then
+        echo "Skipping Module ${module_name}. It's already loaded."
         continue
     fi