[nfs-utils] Reworked how the nfsd service requires the rpcbind service (bz 768550)

[Steve Dickson]

commit b076d24c609b629c1936973de96080791b4993f7
Author: Steve Dickson <steved at redhat.com>
Date:   Mon Jan 16 15:26:48 2012 -0500

    Reworked how the nfsd service requires the rpcbind service (bz 768550)
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

 nfs-lock.service   |    3 ++-
 nfs-server.service |    2 +-
 nfs-utils.spec     |    1 +
 3 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/nfs-lock.service b/nfs-lock.service
index 19efd5f..c1e1708 100644
--- a/nfs-lock.service
+++ b/nfs-lock.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=NFS file locking service.
-After=syslog.target network.target rpcbind.service
+Requires=rpcbind.service network.target
+After=network.target named.service rpcbind.service
 
 [Service]
 Type=forking
diff --git a/nfs-server.service b/nfs-server.service
index 56924a4..f8a26e6 100644
--- a/nfs-server.service
+++ b/nfs-server.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=NFS Server
-Requires=proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount
+Requires=proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount rpcbind.service
 After=network.target named.service rpcbind.service proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount
 
 [Service]
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 070741b..b67b451 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -279,6 +279,7 @@ fi
 %changelog
 * Mon Jan 16 2012 Steve Dickson <steved at redhat.com> 1.2.5-11
 - Update to upstream RC release: nfs-utils-1.2.6-rc6
+- Reworked how the nfsd service requires the rpcbind service (bz 768550)
 
 * Mon Jan  9 2012 Steve Dickson <steved at redhat.com> 1.2.5-10
 - Added back the SUID bits on mount commands (bz 772396)