diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2016-11-30 23:43:05 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-08 10:31:30 +0000 |
commit | a6ae43003adfaff38d6b540672a1511fee53eb2d (patch) | |
tree | 51e01c86c3a20fdf181435aaa2cb77dab2a9f743 /meta/recipes-connectivity | |
parent | 3bbaabfaeb847073a2a4ee253f0fd4d0a31256a8 (diff) | |
download | poky-a6ae43003adfaff38d6b540672a1511fee53eb2d.tar.gz |
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>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb | 2 |
1 files changed, 0 insertions, 2 deletions
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 eb8e99af8c..4a45accaa9 100644 --- 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 () { | |||
125 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ | 125 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ |
126 | ${D}${systemd_unitdir}/system/*.service | 126 | ${D}${systemd_unitdir}/system/*.service |
127 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 127 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
128 | install -d ${D}${sysconfdir}/modules-load.d | ||
129 | echo "nfsd" > ${D}${sysconfdir}/modules-load.d/nfsd.conf | ||
130 | install -m 0644 ${WORKDIR}/proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/ | 128 | install -m 0644 ${WORKDIR}/proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/ |
131 | install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/ | 129 | install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/ |
132 | ln -sf ../proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/sysinit.target.wants/proc-fs-nfsd.mount | 130 | ln -sf ../proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/sysinit.target.wants/proc-fs-nfsd.mount |