[OE-core] [PATCH]nfs-utils: fix systemd nfs-server dependencies

[Szombathelyi György]

    - Fix a circular dependency between nfs-mountd and nfs-server
    - Add proc-fs-nfsd.mount dependency to nfs-mountd and nfs-server
    - Start nfs-server after local-fs.target and network.target
    
    Signed-off-by: Gyorgy Szombathelyi <gyurco at freemail.hu>

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 613ddc0..7f01e01 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,7 @@
 [Unit]
 Description=NFS Mount Daemon
-After=rpcbind.service nfs-server.service
-Requires=rpcbind.service nfs-server.service
+After=rpcbind.service proc-fs-nfsd.mount
+Requires=rpcbind.service proc-fs-nfsd.mount
 
 [Service]
 EnvironmentFile=- at 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 147d7a7..e8b065d 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,12 @@
 [Unit]
 Description=NFS Server
-Requires=rpcbind.service nfs-mountd.service
-After=rpcbind.service
+
+Requires=rpcbind.service nfs-mountd.service proc-fs-nfsd.mount
+After=local-fs.target network.target
+After=rpcbind.service nfs-mountd.service proc-fs-nfsd.mount
+
+# start/stop server before/after client
+Before=remote-fs-pre.target
 
 [Service]
 Type=oneshot