From 8b6e099892287b75a9c654f8c7be92ae1d66002b Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 22 Feb 2012 11:53:26 +0100 Subject: [PATCH] 90kernel-modules/module-setup.sh: exclude nfs* lockd from standard do not install nfs* lockd filesystems for the standard kernel modules --- modules.d/90kernel-modules/module-setup.sh | 2 +- test/TEST-20-NFS/test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh index fa4be0671..26f47844d 100755 --- 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 fa72630c4..c6a96705c 100755 --- 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 -- 2.47.3