summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2014-09-21 01:34:00 +0200
committerAndreas Oberritter <obi@opendreambox.org>2015-02-23 17:15:53 +0100
commit26437a93e22375a8c8948a6b61571eae4557d0f8 (patch)
tree8f4e4ac8db61391c651ee45298e57fbcf3cba421
parent53d1a0d03a5632a24364d63fc18a65d228471da2 (diff)
downloadopenembedded-core-contrib-26437a93e22375a8c8948a6b61571eae4557d0f8.tar.gz
openembedded-core-contrib-26437a93e22375a8c8948a6b61571eae4557d0f8.tar.bz2
openembedded-core-contrib-26437a93e22375a8c8948a6b61571eae4557d0f8.zip
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. Signed-off-by: Andreas Oberritter <obi@opendreambox.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.0.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 @@
Description=NFS Mount Daemon
After=rpcbind.service nfs-server.service
Requires=rpcbind.service nfs-server.service
+ConditionPathExists=@SYSCONFDIR@/exports
[Service]
EnvironmentFile=-@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 @@
Description=NFS Server
Requires=rpcbind.service nfs-mountd.service
After=rpcbind.service
+ConditionPathExists=@SYSCONFDIR@/exports
[Service]
Type=oneshot
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb
index c0460eb61b..c58423da3f 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb
@@ -49,9 +49,9 @@ INITSCRIPT_PARAMS_${PN}-client = "defaults 19 21"
inherit autotools update-rc.d systemd
+SYSTEMD_PACKAGES = "${PN} ${PN}-client"
SYSTEMD_SERVICE_${PN} = "nfs-server.service nfs-mountd.service"
SYSTEMD_SERVICE_${PN}-client = "nfs-statd.service"
-SYSTEMD_AUTO_ENABLE = "disable"
# --enable-uuid is need for cross-compiling
EXTRA_OECONF = "--with-statduser=nobody \