diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2016-11-30 23:43:01 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-08 10:26:13 +0000 |
| commit | 94602d8ced3a8fd033de93b47320c94db6de8755 (patch) | |
| tree | 75c6f972ae9b24b5fa818b1c39b48469ada1b457 /meta/recipes-connectivity | |
| parent | f2cc0fdfd97b097145e40bc52674e17378cec863 (diff) | |
| download | openembedded-core-94602d8ced3a8fd033de93b47320c94db6de8755.tar.gz openembedded-core-94602d8ced3a8fd033de93b47320c94db6de8755.tar.bz2 openembedded-core-94602d8ced3a8fd033de93b47320c94db6de8755.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>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-connectivity')
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.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" inherit autotools-brokensep update-rc.d systemd pkgconfig +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=rpcuser \ |