From: Harald Hoyer <harald@redhat.com>
Date: Thu, 26 Jan 2012 16:30:06 +0000 (+0100)
Subject: fix kernel modules search for s390
X-Git-Tag: 015~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c416b1de5a54ea83d29d99261324d8a4a403bc64;p=thirdparty%2Fdracut.git

fix kernel modules search for s390

find_kernel_modules_by_path only takes one parameter

fixes c254ac796fe52d19ad47df99055cd58fee5e517e
and 4fcd5409e09e693349e991bd2a78303114a735f5
---

diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
index 901741391..384baf1d5 100755
--- a/modules.d/40network/module-setup.sh
+++ b/modules.d/40network/module-setup.sh
@@ -58,7 +58,8 @@ installkernel() {
         [[ $debug ]] && set -x
     }
 
-    find_kernel_modules_by_path drivers/net drivers/s390/net | net_module_filter | instmods
+    { find_kernel_modules_by_path drivers/net; find_kernel_modules_by_path drivers/s390/net } \
+        | net_module_filter | instmods
 
     instmods ecb arc4
     # bridge modules
diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
index f3b40bc54..b78c0052e 100755
--- a/modules.d/90multipath/module-setup.sh
+++ b/modules.d/90multipath/module-setup.sh
@@ -45,7 +45,7 @@ installkernel() {
         done
     }
 
-    ( find_kernel_modules_by_path drivers/scsi drivers/s390/scsi ;
+    ( find_kernel_modules_by_path drivers/scsi; find_kernel_modules_by_path drivers/s390/scsi ;
       find_kernel_modules_by_path drivers/md )  |  mp_mod_filter  |  instmods
     [[ $debug ]] && set -x
 }
diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
index d645dba7e..4b7e292c7 100755
--- a/modules.d/95iscsi/module-setup.sh
+++ b/modules.d/95iscsi/module-setup.sh
@@ -52,7 +52,7 @@ installkernel() {
             esac
         done
     }
-    find_kernel_modules_by_path drivers/scsi drivers/s390/scsi \
+    { find_kernel_modules_by_path drivers/scsi; find_kernel_modules_by_path drivers/s390/scsi } \
     | iscsi_module_filter  |  instmods
 }