From 48d9c62cfec4070cdb1ceda1f94c663a31c2fff5 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@fedoraproject.org>
Date: May 15 2007 15:03:52 +0000
Subject: removed keyutils, keyutils-libs


---

diff --git a/nfs-utils.spec b/nfs-utils.spec
index 1638342..384bb30 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -85,7 +85,7 @@ Requires: rpcbind, sed, gawk, sh-utils, fileutils, textutils, grep
 Requires: modutils >= 2.4.26-9
 BuildRequires: nfs-utils-lib-devel libevent-devel libgssapi-devel
 BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2
-BuildRequires: automake, libtool, keyutils, keyutils-libs
+BuildRequires: automake, libtool
 BuildRequires: tcp_wrappers-devel, e2fsprogs-devel, krb5-devel
 Requires(pre): shadow-utils >= 4.0.3-25
 Requires(pre): /sbin/chkconfig /sbin/nologin
diff --git a/rpcgssd.init b/rpcgssd.init
index f44a24e..a6cc8f1 100755
--- a/rpcgssd.init
+++ b/rpcgssd.init
@@ -31,7 +31,6 @@ fi
 
 
 # Try to use machine credentials by default
-OPTIONS="-M"
 RETVAL=0
 LOCKFILE=/var/lock/subsys/rpcgssd
 prog="rpc.gssd"
@@ -68,7 +67,7 @@ case "$1" in
 	}	
 
 	# Start daemon.
-	daemon $prog ${OPTIONS}
+	daemon $prog ${RPCGSSDARGS}
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch $LOCKFILE
diff --git a/rpcidmapd.init b/rpcidmapd.init
index 6bee482..11878d0 100755
--- a/rpcidmapd.init
+++ b/rpcidmapd.init
@@ -22,7 +22,9 @@ fi
 
 [ ! -x /usr/sbin/rpc.idmapd ] && exit 0
 
-OPTIONS=""
+# Check for and source configuration file otherwise set defaults
+[ -f /etc/sysconfig/nfs ] && . /etc/sysconfig/nfs
+
 RETVAL=0
 LOCKFILE=/var/lock/subsys/rpcidmapd
 prog="rpc.idmapd"
@@ -54,7 +56,7 @@ case "$1" in
 	}	
 
 	# Start daemon.
-	daemon $prog ${OPTIONS}
+	daemon $prog ${RPCIDMAPDARGS}
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch $LOCKFILE
diff --git a/rpcsvcgssd.init b/rpcsvcgssd.init
index f1031b0..12c25a7 100755
--- a/rpcsvcgssd.init
+++ b/rpcsvcgssd.init
@@ -29,7 +29,6 @@ fi
 # List of kernel modules to load
 [ -z "${SECURE_NFS_MODS}" ] && SECURE_NFS_MODS="des rpcsec_gss_krb5"
 
-OPTIONS=""
 RETVAL=0
 LOCKFILE=/var/lock/subsys/rpcsvcgssd
 prog="rpc.svcgssd"
@@ -67,7 +66,7 @@ case "$1" in
 	}	
 
 	# Start daemon.
-	daemon $prog ${OPTIONS}
+	daemon $prog ${RPCSVCGSSDARGS}
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch $LOCKFILE