kernel-modules/module-setup.sh: silently omit some filesystem drivers

diff --git a/dracut-functions.sh b/dracut-functions.sh
index c5bb1c4be8764da8e20eba02401a7c961639446b..eb1278e0104c2db23830fcb3132b468c18b497af 100755 (executable)
--- a/dracut-functions.sh
+++ b/dracut-functions.sh
@@ -1410,6 +1410,14 @@ install_kmod_with_fw() {
         fi
     fi
 
+    if [[ $silent_omit_drivers ]]; then
+        local _kmod=${1##*/}
+        _kmod=${_kmod%.ko}
+        _kmod=${_kmod/-/_}
+        [[ "$_kmod" =~ $silent_omit_drivers ]] && return 0
+        [[ "${1##*/lib/modules/$kernel/}" =~ $silent_omit_drivers ]] && return 0
+    fi
+
     inst_simple "$1" "/lib/modules/$kernel/${1##*/lib/modules/$kernel/}"
     ret=$?
     [[ $DRACUT_KERNEL_LAZY_HASHDIR ]] && \

diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
index 3d4048aae95a2f61472bb7bdf91cc65575f15b23..0e7a9a12727a6f91e0dd177df441e2e9b044a643 100755 (executable)
--- a/modules.d/90kernel-modules/module-setup.sh
+++ b/modules.d/90kernel-modules/module-setup.sh
@@ -61,8 +61,7 @@ installkernel() {
         # if the required list is not set via the filesystems variable
         if ! [[ $hostonly ]]; then
             if [[ -z $filesystems ]]; then
-                omit_drivers="${omit_drivers}|kernel/fs/nfs|kernel/fs/nfsd|kernel/fs/lockd" \
-                    omit_drivers="${omit_drivers##|}" \
+                silent_omit_drivers="kernel/fs/nfs|kernel/fs/nfsd|kernel/fs/lockd" \
                     instmods '=fs'
             fi
         else