[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3603/8267] nfs-utils: sync systemd unit files with nfs-utils.git

[Emmanuele Bassi <ebassi src gnome org>]

commit f46e54c7c9069f8d84483e1ba4cadaa4300c3e18
Author: Andreas Oberritter <obi opendreambox org>
Date:   Wed Nov 30 23:43:06 2016 +0100

    nfs-utils: sync systemd unit files with nfs-utils.git
    
    nfs-server failed to start after installation from a package feed.
    
    (From OE-Core rev: c4d276f9f639a1a534789de12a4783ae931e6aa4)
    
    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>

 .../nfs-utils/nfs-utils/nfs-mountd.service         |    7 +++++--
 .../nfs-utils/nfs-utils/nfs-server.service         |   11 ++++++++---
 .../nfs-utils/nfs-utils/nfs-statd.service          |    9 +++++----
 3 files changed, 18 insertions(+), 9 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 28b7388..27ea58d 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
@@ -1,7 +1,10 @@
 [Unit]
 Description=NFS Mount Daemon
-After=rpcbind.service nfs-server.service
-Requires=rpcbind.service nfs-server.service
+DefaultDependencies=no
+Requires=proc-fs-nfsd.mount
+After=proc-fs-nfsd.mount
+After=network.target local-fs.target
+BindsTo=nfs-server.service
 ConditionPathExists=@SYSCONFDIR@/exports
 
 [Service]
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 b9dfe74..6481377 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
@@ -1,7 +1,11 @@
 [Unit]
-Description=NFS Server
-Requires=rpcbind.service nfs-mountd.service
-After=rpcbind.service
+Description=NFS server and services
+DefaultDependencies=no
+Requires=network.target proc-fs-nfsd.mount
+Requires=nfs-mountd.service
+Wants=rpcbind.service
+After=local-fs.target
+After=network.target proc-fs-nfsd.mount rpcbind.service nfs-mountd.service
 ConditionPathExists=@SYSCONFDIR@/exports
 
 [Service]
@@ -10,6 +14,7 @@ EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf
 ExecStartPre=@SBINDIR@/exportfs -r
 ExecStart=@SBINDIR@/rpc.nfsd $NFSD_OPTS $NFSD_COUNT
 ExecStop=@SBINDIR@/rpc.nfsd 0
+ExecStopPost=@SBINDIR@/exportfs -au
 ExecStopPost=@SBINDIR@/exportfs -f
 ExecReload=@SBINDIR@/exportfs -r
 StandardError=syslog
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
index 746dacf..6e196b8 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
@@ -1,8 +1,9 @@
 [Unit]
-Description=NFS file locking service
-After=rpcbind.service
-Requires=rpcbind.service
-Before=remote-fs-pre.target
+Description=NFS status monitor for NFSv2/3 locking.
+DefaultDependencies=no
+Conflicts=umount.target
+Requires=nss-lookup.target rpcbind.service
+After=network.target nss-lookup.target rpcbind.service
 
 [Service]
 EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf