|
 |
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 2014-09-30 14:51:14.000000000 -0400
|
|
|
64c563 |
+++ nfs-utils-1.3.0/systemd/auth-rpcgss-module.service 2014-09-30 14:51:14.000000000 -0400
|
|
|
64c563 |
@@ -0,0 +1,15 @@
|
|
|
64c563 |
+# We want to start gss-proxy on kernels that support it and rpc.svcgssd
|
|
|
64c563 |
+# on those that don't. Those services check for support by checking
|
|
|
64c563 |
+# for existence of the path /proc/net/rpc/use-gss-proxy. Before they
|
|
|
64c563 |
+# can perform that check, they need this module loaded. (Unless
|
|
|
64c563 |
+# rpcsec_gss support is built directly into the kernel, in which case this
|
|
|
64c563 |
+# unit will fail. But that's OK.)
|
|
|
64c563 |
+[Unit]
|
|
|
64c563 |
+Description=Kernel Module supporting RPCSEC_GSS
|
|
|
64c563 |
+Before=gssproxy.service rpc-svcgssd.service rpc-gssd.service
|
|
|
64c563 |
+Wants=gssproxy.service rpc-svcgssd.service rpc-gssd.service
|
|
|
64c563 |
+ConditionPathExists=/etc/krb5.keytab
|
|
|
64c563 |
+
|
|
|
64c563 |
+[Service]
|
|
|
64c563 |
+Type=oneshot
|
|
|
64c563 |
+ExecStart=/sbin/modprobe -q auth_rpcgss
|
|
|
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 2014-09-30 14:51:14.000000000 -0400
|
|
|
64c563 |
+++ nfs-utils-1.3.0/systemd/nfs-client.target 2014-09-30 14:51:55.000000000 -0400
|
|
|
64c563 |
@@ -5,9 +5,12 @@ Wants=remote-fs-pre.target
|
|
|
64c563 |
|
|
|
64c563 |
# Note: we don't "Wants=rpc-statd.service" as "mount.nfs" will arrange to
|
|
|
64c563 |
# start that on demand if needed.
|
|
|
64c563 |
-Wants=rpc-gssd.service rpc-svcgssd.service
|
|
|
64c563 |
Wants=nfs-blkmap.service rpc-statd-notify.service
|
|
|
64c563 |
-After=rpc-gssd.service rpc-svcgssd.service nfs-blkmap.service
|
|
|
64c563 |
+After=nfs-blkmap.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 |
|
|
|
64c563 |
[Install]
|
|
|
64c563 |
WantedBy=multi-user.target
|
|
|
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 2014-03-25 11:12:07.000000000 -0400
|
|
|
64c563 |
+++ nfs-utils-1.3.0/systemd/nfs-server.service 2014-09-30 14:51:14.000000000 -0400
|
|
|
64c563 |
@@ -2,14 +2,17 @@
|
|
|
64c563 |
Description=NFS server and services
|
|
|
64c563 |
Requires= network.target proc-fs-nfsd.mount rpcbind.target
|
|
|
64c563 |
Requires= nfs-mountd.service
|
|
|
64c563 |
-Wants=rpc-statd.service nfs-idmapd.service rpc-gssd.service rpc-svcgssd.service
|
|
|
64c563 |
+Wants=rpc-statd.service nfs-idmapd.service
|
|
|
64c563 |
Wants=rpc-statd-notify.service
|
|
|
64c563 |
|
|
|
64c563 |
After= network.target proc-fs-nfsd.mount rpcbind.target nfs-mountd.service
|
|
|
64c563 |
After= nfs-idmapd.service rpc-statd.service
|
|
|
64c563 |
-After= rpc-gssd.service rpc-svcgssd.service
|
|
|
64c563 |
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 |
+
|
|
|
64c563 |
Wants=nfs-config.service
|
|
|
64c563 |
After=nfs-config.service
|
|
|
64c563 |
|