summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2015-07-08 16:52:45 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-09 18:00:18 +0100
commit5de2efa167a4c9abec9c5e6c09fffc4c174a3a50 (patch)
tree790c1fef36277d5ac68ee5178ee87dc89ef55ced /meta
parent5a0f48fcb71e8944fcd229213bb73007ada9aae0 (diff)
downloadpoky-5de2efa167a4c9abec9c5e6c09fffc4c174a3a50.tar.gz
nfs-utils: fix to start nfs-server correctly in systemd
Add /etc/modules-load.d/nfsd.conf so that the system loads nfsd at start-up. Add proc-fs-nfsd.mount systemd unit file because it's needed for nfs server to start correctly. After this change, in a systemd based image, we can use `systemctl start nfs-server' to start the nfs server and things would work correctly. (From OE-Core rev: 3d4380bb36eb108dc75fee7215b615f7800b0990) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount8
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb10
2 files changed, 18 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount b/meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount
new file mode 100644
index 0000000000..630801b375
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount
@@ -0,0 +1,8 @@
1[Unit]
2Description=NFSD configuration filesystem
3After=systemd-modules-load.service
4
5[Mount]
6What=nfsd
7Where=/proc/fs/nfsd
8Type=nfsd
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb
index 0bcd65e0d0..6da85090d5 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb
@@ -28,6 +28,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
28 file://nfs-server.service \ 28 file://nfs-server.service \
29 file://nfs-mountd.service \ 29 file://nfs-mountd.service \
30 file://nfs-statd.service \ 30 file://nfs-statd.service \
31 file://proc-fs-nfsd.mount \
31 file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \ 32 file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \
32 file://nfs-utils-debianize-start-statd.patch \ 33 file://nfs-utils-debianize-start-statd.patch \
33" 34"
@@ -87,6 +88,8 @@ FILES_${PN}-client = "${base_sbindir}/*mount.nfs* ${sbindir}/*statd \
87FILES_${PN}-stats = "${sbindir}/mountstats ${sbindir}/nfsiostat" 88FILES_${PN}-stats = "${sbindir}/mountstats ${sbindir}/nfsiostat"
88RDEPENDS_${PN}-stats = "python" 89RDEPENDS_${PN}-stats = "python"
89 90
91FILES_${PN} += "${systemd_unitdir}"
92
90# Make clean needed because the package comes with 93# Make clean needed because the package comes with
91# precompiled 64-bit objects that break the build 94# precompiled 64-bit objects that break the build
92do_compile_prepend() { 95do_compile_prepend() {
@@ -108,6 +111,13 @@ do_install_append () {
108 sed -i -e 's,@SBINDIR@,${sbindir},g' \ 111 sed -i -e 's,@SBINDIR@,${sbindir},g' \
109 -e 's,@SYSCONFDIR@,${sysconfdir},g' \ 112 -e 's,@SYSCONFDIR@,${sysconfdir},g' \
110 ${D}${systemd_unitdir}/system/*.service 113 ${D}${systemd_unitdir}/system/*.service
114 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
115 install -d ${D}${sysconfdir}/modules-load.d
116 echo "nfsd" > ${D}${sysconfdir}/modules-load.d/nfsd.conf
117 install -m 0644 ${WORKDIR}/proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/
118 install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/
119 ln -sf ../proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/sysinit.target.wants/proc-fs-nfsd.mount
120 fi
111 121
112 # kernel code as of 3.8 hard-codes this path as a default 122 # kernel code as of 3.8 hard-codes this path as a default
113 install -d ${D}/var/lib/nfs/v4recovery 123 install -d ${D}/var/lib/nfs/v4recovery