[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH 2/2] mkinitrd: Minor cleanups



While fixing 501135 I noticed that mkinitrd still has a few places where
we expect modules to be part of modlist with their full path and .ko extension
since they never get added to modlist this way, this can never happen.

This patch removes the code to handle this as well as the
unused fullmodule variable.
---
 mkinitrd |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/mkinitrd b/mkinitrd
index a723876..d83e9df 100755
--- a/mkinitrd
+++ b/mkinitrd
@@ -176,10 +176,6 @@ findmodule() {
         modName="${modName##-}"
     fi
 
-    case "$(eval echo \${$modlist}) " in
-        *"/$modName.ko "*) return ;;
-    esac
-
     if echo $builtins | egrep -q '(^| )'$modName'( |$)' ; then
         vecho "module $modName assumed to be built in"
         return
@@ -1324,8 +1320,7 @@ emitmodules() {
     usb_mounted="prep"
     for MODULE in $(eval echo \${$modlist}) ; do
         text=""
-        module=`echo $MODULE | sed -e "s|.*/||" -e "s/\.k\?o$//"`
-        fullmodule=`echo $MODULE | sed "s|.*/||"`
+        module=$MODULE
 
         options=`sed -n -e ':a' -e '/\\\\$/N; s/\\\\\n//; ta' -e "s/^options[ 	][ 	]*$module[ 	][ 	]*//p" $modulefile 2>/dev/null`
 
-- 
1.6.2.2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]