90kernel-modules/module-setup.sh: exclude nfs* lockd from standard

do not install nfs* lockd filesystems for the standard kernel modules

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

diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index fa72630c4575c70d21b27e60815f776aa7116fa3..c6a96705c93470d688e758a1528a77538fcfad51 100755 (executable)
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -225,7 +225,7 @@ test_setup() {
        [ -f /etc/netconfig ] && dracut_install /etc/netconfig
        type -P dhcpd >/dev/null && dracut_install dhcpd
        [ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd
-       instmods nfsd sunrpc ipv6
+       instmods nfsd sunrpc ipv6 lockd
        inst ./server-init.sh /sbin/init
        inst ./hosts /etc/hosts
        inst ./exports /etc/exports