summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Dickson <steved@redhat.com>2015-11-09 11:28:30 -0500
committerSteve Dickson <steved@redhat.com>2015-11-16 15:05:35 -0500
commit4fabfcd082069a16ea8769b9ea9344fc15011366 (patch)
tree8ce4638160433c7a48e273d6b112a7ee898b7980
parent67a0768370a54100c77e58f611e1d1fceb93e2c0 (diff)
downloadnfs-utils-4fabfcd082069a16ea8769b9ea9344fc15011366.tar.gz
systemd: Decouple the starting and stopping of rpcbind/nfs-server
Commit b98f2af15 introduced a regression that cause the starting and stop of rpcbind and the nfs-server to be depended on each other The starting of the NFS server should start rpcbind but bring rpcbind down should not bring the NFS server down. Signed-off-by: Steve Dickson <steved@redhat.com>
-rw-r--r--systemd/nfs-server.service2
-rw-r--r--systemd/rpc-statd.service2
2 files changed, 2 insertions, 2 deletions
diff --git a/systemd/nfs-server.service b/systemd/nfs-server.service
index 12b02f2..317e5d6 100644
--- a/systemd/nfs-server.service
+++ b/systemd/nfs-server.service
@@ -1,7 +1,7 @@
[Unit]
Description=NFS server and services
DefaultDependencies=no
-Requires= network.target proc-fs-nfsd.mount rpcbind.service
+Requires= network.target proc-fs-nfsd.mount rpcbind.target
Requires= nfs-mountd.service
Wants=rpc-statd.service nfs-idmapd.service
Wants=rpc-statd-notify.service
diff --git a/systemd/rpc-statd.service b/systemd/rpc-statd.service
index 14604d7..f16ea42 100644
--- a/systemd/rpc-statd.service
+++ b/systemd/rpc-statd.service
@@ -3,7 +3,7 @@ Description=NFS status monitor for NFSv2/3 locking.
DefaultDependencies=no
Conflicts=umount.target
Requires=nss-lookup.target rpcbind.target
-After=network.target nss-lookup.target rpcbind.target
+After=network.target nss-lookup.target rpcbind.service
PartOf=nfs-utils.service