rpms/nfs-utils/devel nfs-utils.spec, 1.142, 1.143 rpcgssd.init, 1.7, 1.8 rpcidmapd.init, 1.6, 1.7 rpcsvcgssd.init, 1.5, 1.6

[Steve Dickson (steved)]

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12123

Modified Files:
	nfs-utils.spec rpcgssd.init rpcidmapd.init rpcsvcgssd.init 
Log Message:
removed keyutils, keyutils-libs



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- nfs-utils.spec	13 May 2007 18:15:04 -0000	1.142
+++ nfs-utils.spec	15 May 2007 15:03:52 -0000	1.143
@@ -85,7 +85,7 @@
 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


Index: rpcgssd.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/rpcgssd.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rpcgssd.init	9 Mar 2007 16:17:31 -0000	1.7
+++ rpcgssd.init	15 May 2007 15:03:52 -0000	1.8
@@ -31,7 +31,6 @@
 
 
 # Try to use machine credentials by default
-OPTIONS="-M"
 RETVAL=0
 LOCKFILE=/var/lock/subsys/rpcgssd
 prog="rpc.gssd"
@@ -68,7 +67,7 @@
 	}	
 
 	# Start daemon.
-	daemon $prog ${OPTIONS}
+	daemon $prog ${RPCGSSDARGS}
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch $LOCKFILE


Index: rpcidmapd.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/rpcidmapd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rpcidmapd.init	9 Mar 2007 16:17:31 -0000	1.6
+++ rpcidmapd.init	15 May 2007 15:03:52 -0000	1.7
@@ -22,7 +22,9 @@
 
 [ ! -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 @@
 	}	
 
 	# Start daemon.
-	daemon $prog ${OPTIONS}
+	daemon $prog ${RPCIDMAPDARGS}
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch $LOCKFILE


Index: rpcsvcgssd.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/rpcsvcgssd.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpcsvcgssd.init	9 Mar 2007 16:17:31 -0000	1.5
+++ rpcsvcgssd.init	15 May 2007 15:03:52 -0000	1.6
@@ -29,7 +29,6 @@
 # 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 @@
 	}	
 
 	# Start daemon.
-	daemon $prog ${OPTIONS}
+	daemon $prog ${RPCSVCGSSDARGS}
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch $LOCKFILE