|
 |
64c563 |
diff -up nfs-utils-1.3.0/systemd/auth-rpcgss-module.service.orig nfs-utils-1.3.0/systemd/auth-rpcgss-module.service
|
|
|
64c563 |
--- nfs-utils-1.3.0/systemd/auth-rpcgss-module.service.orig 2017-05-22 11:22:16.064030000 -0400
|
|
|
64c563 |
+++ nfs-utils-1.3.0/systemd/auth-rpcgss-module.service 2017-06-06 16:19:05.229155456 -0400
|
|
|
64c563 |
@@ -7,8 +7,8 @@
|
|
|
64c563 |
[Unit]
|
|
|
64c563 |
Description=Kernel Module supporting RPCSEC_GSS
|
|
|
64c563 |
DefaultDependencies=no
|
|
|
64c563 |
-Before=gssproxy.service rpc-svcgssd.service rpc-gssd.service
|
|
|
64c563 |
-Wants=gssproxy.service rpc-svcgssd.service rpc-gssd.service
|
|
|
64c563 |
+Before=gssproxy.service rpc-gssd.service
|
|
|
64c563 |
+Wants=gssproxy.service rpc-gssd.service
|
|
|
64c563 |
ConditionPathExists=/etc/krb5.keytab
|
|
|
64c563 |
|
|
|
64c563 |
[Service]
|
|
|
64c563 |
diff -up nfs-utils-1.3.0/systemd/nfs-client.target.orig nfs-utils-1.3.0/systemd/nfs-client.target
|
|
|
64c563 |
--- nfs-utils-1.3.0/systemd/nfs-client.target.orig 2017-05-22 11:22:16.054029846 -0400
|
|
|
64c563 |
+++ nfs-utils-1.3.0/systemd/nfs-client.target 2017-06-06 16:19:26.653588268 -0400
|
|
|
64c563 |
@@ -9,7 +9,7 @@ Wants=rpc-statd-notify.service
|
|
|
64c563 |
|
|
|
64c563 |
# GSS services dependencies and ordering
|
|
|
64c563 |
Wants=auth-rpcgss-module.service
|
|
|
64c563 |
-After=rpc-gssd.service rpc-svcgssd.service gssproxy.service
|
|
|
64c563 |
+After=rpc-gssd.service gssproxy.service
|
|
|
64c563 |
|
|
|
64c563 |
[Install]
|
|
|
64c563 |
WantedBy=multi-user.target
|
|
|
64c563 |
diff -up nfs-utils-1.3.0/systemd/nfs.conf.man.orig nfs-utils-1.3.0/systemd/nfs.conf.man
|
|
|
64c563 |
--- nfs-utils-1.3.0/systemd/nfs.conf.man.orig 2017-05-22 11:22:16.118030830 -0400
|
|
|
64c563 |
+++ nfs-utils-1.3.0/systemd/nfs.conf.man 2017-06-06 16:20:11.502494296 -0400
|
|
|
64c563 |
@@ -208,15 +208,6 @@ See
|
|
|
64c563 |
for details.
|
|
|
64c563 |
|
|
|
64c563 |
.TP
|
|
|
64c563 |
-.B svcgssd
|
|
|
64c563 |
-Recognized values:
|
|
|
64c563 |
-.BR principal .
|
|
|
64c563 |
-
|
|
|
64c563 |
-See
|
|
|
64c563 |
-.BR rpc.svcgssd (8)
|
|
|
64c563 |
-for details.
|
|
|
64c563 |
-
|
|
|
64c563 |
-.TP
|
|
|
64c563 |
.B exportfs
|
|
|
64c563 |
Only
|
|
|
64c563 |
.B debug=
|
|
|
64c563 |
diff -up nfs-utils-1.3.0/systemd/nfs-server.service.orig nfs-utils-1.3.0/systemd/nfs-server.service
|
|
|
64c563 |
--- nfs-utils-1.3.0/systemd/nfs-server.service.orig 2017-05-22 11:22:16.138031137 -0400
|
|
|
64c563 |
+++ nfs-utils-1.3.0/systemd/nfs-server.service 2017-06-06 16:16:55.197527187 -0400
|
|
|
64c563 |
@@ -14,7 +14,7 @@ Before= rpc-statd-notify.service
|
|
|
64c563 |
|
|
|
64c563 |
# GSS services dependencies and ordering
|
|
|
64c563 |
Wants=auth-rpcgss-module.service
|
|
|
64c563 |
-After=rpc-gssd.service gssproxy.service rpc-svcgssd.service
|
|
|
64c563 |
+After=rpc-gssd.service gssproxy.service
|
|
|
64c563 |
|
|
|
64c563 |
Wants=nfs-config.service
|
|
|
64c563 |
After=nfs-config.service
|
|
|
64c563 |
@@ -25,6 +25,7 @@ EnvironmentFile=-/run/sysconfig/nfs-util
|
|
|
64c563 |
Type=oneshot
|
|
|
64c563 |
RemainAfterExit=yes
|
|
|
64c563 |
ExecStartPre=-/usr/sbin/exportfs -r
|
|
|
64c563 |
+ExecStartPre=-/bin/sh -c '/bin/kill -HUP `cat /run/gssproxy.pid`'
|
|
|
64c563 |
ExecStart=/usr/sbin/rpc.nfsd $RPCNFSDARGS
|
|
|
64c563 |
ExecStop=/usr/sbin/rpc.nfsd 0
|
|
|
64c563 |
ExecStopPost=/usr/sbin/exportfs -au
|
|
|
64c563 |
diff -up nfs-utils-1.3.0/systemd/rpc-gssd.service.orig nfs-utils-1.3.0/systemd/rpc-gssd.service
|
|
|
64c563 |
--- nfs-utils-1.3.0/systemd/rpc-gssd.service.orig 2014-03-25 11:12:07.000000000 -0400
|
|
|
64c563 |
+++ nfs-utils-1.3.0/systemd/rpc-gssd.service 2017-06-06 16:24:08.932290804 -0400
|
|
|
64c563 |
@@ -3,7 +3,7 @@ Description=RPC security service for NFS
|
|
|
64c563 |
DefaultDependencies=no
|
|
|
64c563 |
Conflicts=umount.target
|
|
|
64c563 |
Requires=var-lib-nfs-rpc_pipefs.mount
|
|
|
64c563 |
-After=var-lib-nfs-rpc_pipefs.mount
|
|
|
64c563 |
+After=var-lib-nfs-rpc_pipefs.mount gssproxy.service
|
|
|
64c563 |
|
|
|
64c563 |
ConditionPathExists=/etc/krb5.keytab
|
|
|
64c563 |
|