summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2016-11-30 23:43:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-08 10:31:30 +0000
commit44ed428c10cc4591868c198fac55c04e3c2e0758 (patch)
tree9e44ec8113683175a2554ec16f5d822026378196
parentb4da2b0040543f55cd9a2908d77d9d79a387a539 (diff)
downloadpoky-44ed428c10cc4591868c198fac55c04e3c2e0758.tar.gz
nfs-utils: systemd fixes
- Start daemons by default like the initscripts do, but only if /etc/exports exists. - Inform systemd.bbclass about nfs-utils-client package. (From OE-Core rev: 94602d8ced3a8fd033de93b47320c94db6de8755) 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>
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service1
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service1
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb2
3 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
index 613ddc003a..28b7388f67 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
@@ -2,6 +2,7 @@
2Description=NFS Mount Daemon 2Description=NFS Mount Daemon
3After=rpcbind.service nfs-server.service 3After=rpcbind.service nfs-server.service
4Requires=rpcbind.service nfs-server.service 4Requires=rpcbind.service nfs-server.service
5ConditionPathExists=@SYSCONFDIR@/exports
5 6
6[Service] 7[Service]
7EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf 8EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
index 147d7a7b5f..b9dfe74273 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
@@ -2,6 +2,7 @@
2Description=NFS Server 2Description=NFS Server
3Requires=rpcbind.service nfs-mountd.service 3Requires=rpcbind.service nfs-mountd.service
4After=rpcbind.service 4After=rpcbind.service
5ConditionPathExists=@SYSCONFDIR@/exports
5 6
6[Service] 7[Service]
7Type=oneshot 8Type=oneshot
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 4d6d8080f4..d4b401efa0 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
@@ -48,9 +48,9 @@ INITSCRIPT_PARAMS_${PN}-client = "defaults 19 21"
48 48
49inherit autotools-brokensep update-rc.d systemd pkgconfig 49inherit autotools-brokensep update-rc.d systemd pkgconfig
50 50
51SYSTEMD_PACKAGES = "${PN} ${PN}-client"
51SYSTEMD_SERVICE_${PN} = "nfs-server.service nfs-mountd.service" 52SYSTEMD_SERVICE_${PN} = "nfs-server.service nfs-mountd.service"
52SYSTEMD_SERVICE_${PN}-client = "nfs-statd.service" 53SYSTEMD_SERVICE_${PN}-client = "nfs-statd.service"
53SYSTEMD_AUTO_ENABLE = "disable"
54 54
55# --enable-uuid is need for cross-compiling 55# --enable-uuid is need for cross-compiling
56EXTRA_OECONF = "--with-statduser=rpcuser \ 56EXTRA_OECONF = "--with-statduser=rpcuser \