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 90174139148de259d17ab6f53aafbcecdfa38ba2..384baf1d537af0d5d58bb33be0a07a08be95bc86 100755 (executable)
--- 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 f3b40bc540a497dac160a19095d72a32145d102c..b78c0052e74d3cd27b8be8e0896938f472029f48 100755 (executable)
--- 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 d645dba7ea4fe048f00b5ff581f0c2ebec551099..4b7e292c75f1a91f73a84d72b32c1a13d9825507 100755 (executable)
--- 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
 }