|
 |
e19a30 |
diff -up nfs-utils-1.3.0/systemd/nfs-idmapd.service.orig nfs-utils-1.3.0/systemd/nfs-idmapd.service
|
|
|
e19a30 |
--- nfs-utils-1.3.0/systemd/nfs-idmapd.service.orig 2014-03-25 11:12:07.000000000 -0400
|
|
|
e19a30 |
+++ nfs-utils-1.3.0/systemd/nfs-idmapd.service 2015-01-15 08:04:55.291478000 -0500
|
|
|
e19a30 |
@@ -1,7 +1,7 @@
|
|
|
e19a30 |
[Unit]
|
|
|
e19a30 |
Description=NFSv4 ID-name mapping service
|
|
|
e19a30 |
|
|
|
e19a30 |
-PartOf=nfs-utils.service
|
|
|
e19a30 |
+BindsTo=nfs-server.service
|
|
|
e19a30 |
|
|
|
e19a30 |
Wants=nfs-config.service
|
|
|
e19a30 |
After=nfs-config.service
|
|
|
e19a30 |
diff -up nfs-utils-1.3.0/systemd/nfs-mountd.service.orig nfs-utils-1.3.0/systemd/nfs-mountd.service
|
|
|
e19a30 |
--- nfs-utils-1.3.0/systemd/nfs-mountd.service.orig 2014-03-25 11:12:07.000000000 -0400
|
|
|
e19a30 |
+++ nfs-utils-1.3.0/systemd/nfs-mountd.service 2015-01-15 08:04:55.300477000 -0500
|
|
|
e19a30 |
@@ -3,8 +3,7 @@ Description=NFS Mount Daemon
|
|
|
e19a30 |
Requires=proc-fs-nfsd.mount
|
|
|
e19a30 |
After=proc-fs-nfsd.mount
|
|
|
e19a30 |
After=network.target
|
|
|
e19a30 |
-PartOf=nfs-server.service
|
|
|
e19a30 |
-PartOf=nfs-utils.service
|
|
|
e19a30 |
+BindsTo=nfs-server.service
|
|
|
e19a30 |
|
|
|
e19a30 |
Wants=nfs-config.service
|
|
|
e19a30 |
After=nfs-config.service
|
|
|
e19a30 |
diff -up nfs-utils-1.3.0/systemd/rpc-statd-notify.service.orig nfs-utils-1.3.0/systemd/rpc-statd-notify.service
|
|
|
e19a30 |
--- nfs-utils-1.3.0/systemd/rpc-statd-notify.service.orig 2014-03-25 11:12:07.000000000 -0400
|
|
|
e19a30 |
+++ nfs-utils-1.3.0/systemd/rpc-statd-notify.service 2015-01-15 08:06:17.251900000 -0500
|
|
|
e19a30 |
@@ -14,6 +14,5 @@ After=nfs-config.service
|
|
|
e19a30 |
|
|
|
e19a30 |
[Service]
|
|
|
e19a30 |
EnvironmentFile=-/run/sysconfig/nfs-utils
|
|
|
e19a30 |
-Type=oneshot
|
|
|
e19a30 |
-RemainAfterExit=yes
|
|
|
e19a30 |
-ExecStart=-/usr/sbin/sm-notify -d $SMNOTIFYARGS
|
|
|
e19a30 |
+Type=forking
|
|
|
e19a30 |
+ExecStart=-/usr/sbin/sm-notify $SMNOTIFYARGS
|
|
|
e19a30 |
diff -up nfs-utils-1.3.0/utils/statd/start-statd.orig nfs-utils-1.3.0/utils/statd/start-statd
|
|
|
e19a30 |
--- nfs-utils-1.3.0/utils/statd/start-statd.orig 2015-01-15 08:03:24.456789000 -0500
|
|
|
e19a30 |
+++ nfs-utils-1.3.0/utils/statd/start-statd 2015-01-15 08:05:34.612638000 -0500
|
|
|
e19a30 |
@@ -5,9 +5,12 @@
|
|
|
e19a30 |
# It should run statd with whatever flags are apropriate for this
|
|
|
e19a30 |
# site.
|
|
|
e19a30 |
PATH="/sbin:/usr/sbin:/bin:/usr/bin"
|
|
|
e19a30 |
-if systemctl start rpc-statd.service
|
|
|
e19a30 |
-then :
|
|
|
e19a30 |
-else
|
|
|
e19a30 |
- exec rpc.statd --no-notify
|
|
|
e19a30 |
+
|
|
|
e19a30 |
+# First try systemd if it's installed.
|
|
|
e19a30 |
+if [ -d /run/systemd/system ]; then
|
|
|
e19a30 |
+ # Quit only if the call worked.
|
|
|
e19a30 |
+ systemctl start rpc-statd.service && exit
|
|
|
e19a30 |
fi
|
|
|
e19a30 |
|
|
|
e19a30 |
+# Fall back to launching it ourselves.
|
|
|
e19a30 |
+exec rpc.statd --no-notify
|