Blame SOURCES/nfs-utils-1.3.0-systemd-network-online.patch

fc3648
diff --git a/systemd/nfs-mountd.service b/systemd/nfs-mountd.service
fc3648
index 8a39f3e..ed357a2 100644
fc3648
--- a/systemd/nfs-mountd.service
fc3648
+++ b/systemd/nfs-mountd.service
fc3648
@@ -2,8 +2,10 @@
fc3648
 Description=NFS Mount Daemon
fc3648
 DefaultDependencies=no
fc3648
 Requires=proc-fs-nfsd.mount
fc3648
+Wants=network-online.target
fc3648
 After=proc-fs-nfsd.mount
fc3648
-After=network.target local-fs.target
fc3648
+After=network-online.target local-fs.target
fc3648
+After=rpcbind.socket
fc3648
 BindsTo=nfs-server.service
fc3648
 
fc3648
 Wants=nfs-config.service
fc3648
diff --git a/systemd/nfs-server.service b/systemd/nfs-server.service
fc3648
index 7f60f39..d285c6e 100644
fc3648
--- a/systemd/nfs-server.service
fc3648
+++ b/systemd/nfs-server.service
fc3648
@@ -1,13 +1,14 @@
fc3648
 [Unit]
fc3648
 Description=NFS server and services
fc3648
 DefaultDependencies=no
fc3648
-Requires= network.target proc-fs-nfsd.mount rpcbind.target
fc3648
+Requires= network.target proc-fs-nfsd.mount
fc3648
 Requires= nfs-mountd.service
fc3648
+Wants=rpcbind.socket network-online.target
fc3648
 Wants=rpc-statd.service nfs-idmapd.service
fc3648
 Wants=rpc-statd-notify.service
fc3648
 
fc3648
-After= local-fs.target
fc3648
-After= network.target proc-fs-nfsd.mount rpcbind.service nfs-mountd.service
fc3648
+After= network-online.target local-fs.target
fc3648
+After= proc-fs-nfsd.mount rpcbind.socket nfs-mountd.service
fc3648
 After= nfs-idmapd.service rpc-statd.service
fc3648
 Before= rpc-statd-notify.service
fc3648
 
fc3648
diff --git a/systemd/rpc-statd-notify.service b/systemd/rpc-statd-notify.service
fc3648
index 7a37ce1..f27f76d 100644
fc3648
--- a/systemd/rpc-statd-notify.service
fc3648
+++ b/systemd/rpc-statd-notify.service
fc3648
@@ -1,8 +1,8 @@
fc3648
 [Unit]
fc3648
 Description=Notify NFS peers of a restart
fc3648
 DefaultDependencies=no
fc3648
-Requires=network.target
fc3648
-After=local-fs.target network.target nss-lookup.target
fc3648
+Wants=network-online.target
fc3648
+After=local-fs.target network-online.target nss-lookup.target
fc3648
 
fc3648
 # Do not start up in HA environments
fc3648
 ConditionPathExists=!/var/lib/nfs/statd/sm.ha
fc3648
diff --git a/systemd/rpc-statd.service b/systemd/rpc-statd.service
fc3648
index 2a054be..1ed60a8 100644
fc3648
--- a/systemd/rpc-statd.service
fc3648
+++ b/systemd/rpc-statd.service
fc3648
@@ -2,8 +2,9 @@
fc3648
 Description=NFS status monitor for NFSv2/3 locking.
fc3648
 DefaultDependencies=no
fc3648
 Conflicts=umount.target
fc3648
-Requires=nss-lookup.target rpcbind.target
fc3648
-After=network.target nss-lookup.target rpcbind.service
fc3648
+Requires=nss-lookup.target rpcbind.socket
fc3648
+Wants=network-online.target
fc3648
+After=network-online.target nss-lookup.target rpcbind.socket
fc3648
 
fc3648
 PartOf=nfs-utils.service
fc3648