From: Harald Hoyer <harald@redhat.com>
Date: Wed, 31 Jul 2013 11:49:52 +0000 (+0200)
Subject: kernel-modules/module-setup.sh: silently omit some filesystem drivers
X-Git-Tag: 031~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=868f935e23bc7b9e3d6378c868cd91853587d2d0;p=thirdparty%2Fdracut.git

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

diff --git a/dracut-functions.sh b/dracut-functions.sh
index c5bb1c4be..eb1278e01 100755
--- 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 3d4048aae..0e7a9a127 100755
--- 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