From aa52848050f17f28cf88306ec4df12110241b32b Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@redhat.com>
Date: Jun 10 2015 14:04:08 +0000
Subject: Make systemd args backwards compatible (bz 1210751)


Signed-off-by: Steve Dickson <steved@redhat.com>

---

diff --git a/nfs-utils-1.3.2-systemd-gssargs.patch b/nfs-utils-1.3.2-systemd-gssargs.patch
new file mode 100644
index 0000000..1c91f07
--- /dev/null
+++ b/nfs-utils-1.3.2-systemd-gssargs.patch
@@ -0,0 +1,18 @@
+diff -up nfs-utils-1.3.2/systemd/rpc-gssd.service.orig nfs-utils-1.3.2/systemd/rpc-gssd.service
+--- nfs-utils-1.3.2/systemd/rpc-gssd.service.orig	2015-01-30 15:42:15.000000000 -0500
++++ nfs-utils-1.3.2/systemd/rpc-gssd.service	2015-06-10 09:24:57.224547972 -0400
+@@ -16,4 +16,4 @@ After=nfs-config.service
+ EnvironmentFile=-/run/sysconfig/nfs-utils
+ 
+ Type=forking
+-ExecStart=/usr/sbin/rpc.gssd $GSSDARGS
++ExecStart=/usr/sbin/rpc.gssd $RPCGSSDARGS
+diff -up nfs-utils-1.3.2/systemd/rpc-svcgssd.service.orig nfs-utils-1.3.2/systemd/rpc-svcgssd.service
+--- nfs-utils-1.3.2/systemd/rpc-svcgssd.service.orig	2015-06-10 08:28:05.471097916 -0400
++++ nfs-utils-1.3.2/systemd/rpc-svcgssd.service	2015-06-10 09:25:44.691158360 -0400
+@@ -17,4 +17,4 @@ After=nfs-config.service
+ [Service]
+ EnvironmentFile=-/run/sysconfig/nfs-utils
+ Type=forking
+-ExecStart=/usr/sbin/rpc.svcgssd $SVCGSSDARGS
++ExecStart=/usr/sbin/rpc.svcgssd $RPCSVCGSSDARGS
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 52a3495..692854c 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.3.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -22,6 +22,7 @@ Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
 Patch102: nfs-utils-1.2.3-sm-notify-res_init.patch
 Patch103: nfs-utils-1.2.5-idmap-errmsg.patch
 Patch104: systemd-Set-var-lib-nfs-rpc_pipefs.mount-After-tmpfi.patch
+Patch105: nfs-utils-1.3.2-systemd-gssargs.patch
 
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
@@ -80,6 +81,7 @@ This package also contains the mount.nfs and umount.nfs program.
 %patch102 -p1
 %patch103 -p1
 %patch104 -p1
+%patch105 -p1
 
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
@@ -307,6 +309,9 @@ fi
 /sbin/umount.nfs4
 
 %changelog
+* Wed Jun 10 2015 Steve Dickson <steved@redhat.com> 1.3.2-8
+- Make systemd args backwards compatible (bz 1210751)
+
 * Tue May 12 2015 Colin Walters <walters@redhat.com> - 1:1.3.2-7
 - Add patch to fix initial start on OSTree managed systems (bz 1219871)