check for arch before installing drivers/s390

diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
index 4ed8d03b32baf6c53625e7a45e2b1cdf41325a05..a8efbc5bf6bd483357af5075dabd200dd3d99b32 100755 (executable)
--- a/modules.d/40network/module-setup.sh
+++ b/modules.d/40network/module-setup.sh
@@ -61,7 +61,7 @@ installkernel() {
         return $_ret
     }
 
-    { find_kernel_modules_by_path drivers/net; find_kernel_modules_by_path drivers/s390/net; } \
+    { find_kernel_modules_by_path drivers/net; if [ "$_arch" = "s390" -o "$_arch" = "s390x" ]; then find_kernel_modules_by_path drivers/s390/net; fi; } \
         | net_module_filter | instmods
 
     instmods =drivers/net/phy

diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
index bf71fdc05b6ea7a0653ec88596f29ac14523668c..0e8857cba1338b46e1e266a13475dd4656e959b8 100755 (executable)
--- a/modules.d/90multipath/module-setup.sh
+++ b/modules.d/90multipath/module-setup.sh
@@ -44,7 +44,7 @@ installkernel() {
         done
     }
 
-    ( find_kernel_modules_by_path drivers/scsi; find_kernel_modules_by_path drivers/s390/scsi ;
+    ( find_kernel_modules_by_path drivers/scsi; if [ "$_arch" = "s390" -o "$_arch" = "s390x" ]; then find_kernel_modules_by_path drivers/s390/scsi; fi;
       find_kernel_modules_by_path drivers/md )  |  mp_mod_filter  |  instmods
     _ret=$?
     [[ $debug ]] && set -x