nfs-utils: don't try to load kernel module

This conflicts with KERNEL_MODULE_AUTOLOAD += "nfsd".

(From OE-Core rev: 759b7536756ac6fb6ad431ab8e48a03283f9ec29)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
index eb8e99af8c435dfb621abff5678ff16f39ba4d4c..4a45accaa9a3f2f88e588b2f5c253ed0f41b7ecb 100644 (file)
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
@@ -125,8 +125,6 @@ do_install_append () {
                -e 's,@SYSCONFDIR@,${sysconfdir},g' \
                ${D}${systemd_unitdir}/system/*.service
        if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
-           install -d ${D}${sysconfdir}/modules-load.d
-           echo "nfsd" > ${D}${sysconfdir}/modules-load.d/nfsd.conf
            install -m 0644 ${WORKDIR}/proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/
            install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/
            ln -sf ../proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/sysinit.target.wants/proc-fs-nfsd.mount