rpms/ypbind/F-8 ypbind.init,1.18,1.19 ypbind.spec,1.44,1.45

[Vitezslav Crhonek (vcrhonek)]

Author: vcrhonek

Update of /cvs/extras/rpms/ypbind/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv494

Modified Files:
	ypbind.init ypbind.spec 
Log Message:
Fix ypbind startup fails because of timeout error in init script


Index: ypbind.init
===================================================================
RCS file: /cvs/extras/rpms/ypbind/F-8/ypbind.init,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ypbind.init	17 Sep 2007 13:03:39 -0000	1.18
+++ ypbind.init	4 Feb 2008 16:06:24 -0000	1.19
@@ -81,19 +81,31 @@
 	# the following fixes problems with the init scripts continuing
 	# even when we are really not bound yet to a server, and then things
 	# that need NIS fail.
-	timeout=$NISTIMEOUT
+	timeout=10
+	failure=0
 	while [ $timeout -gt 0 ]; do
-	    /usr/sbin/rpcinfo -p | LC_ALL=C fgrep -q ypbind && \
+		if /usr/sbin/rpcinfo -p | LC_ALL=C fgrep -q ypbind
+		then
+			if [ $failure -eq 1 ]; then
+				# reset timeout
+				timeout=$NISTIMEOUT
+				failure=0
+			fi
 			/usr/bin/ypwhich > /dev/null 2>&1
-	    RETVAL=$?
-	    if [ $RETVAL -eq 0 ]; then
-		break;
-	    fi
-	    echo -n "..."
-	    # ypwhich has a hardcode 15sec timeout
-	    # so subtract that from NISTIMEOUT to
-	    # to see of we should continue to wait
-	    timeout=`expr $timeout - 15` 
+	    	RETVAL=$?
+	    	if [ $RETVAL -eq 0 ]; then
+				break;
+	    	fi
+	    	# ypwhich has a hardcode 15sec timeout
+	    	# so subtract that from NISTIMEOUT to
+	    	# to see of we should continue to wait
+	    	timeout=`expr $timeout - 15` 
+		else # wait for ypbind to get started
+			sleep 2
+			timeout=`expr $timeout - 2`
+			failure=1
+		fi
+		echo -n "..."
 	done
 	if [ $RETVAL -eq 0 ]; then
 	    logger -t ypbind \


Index: ypbind.spec
===================================================================
RCS file: /cvs/extras/rpms/ypbind/F-8/ypbind.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ypbind.spec	17 Sep 2007 13:03:39 -0000	1.44
+++ ypbind.spec	4 Feb 2008 16:06:24 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain.
 Name: ypbind
 Version: 1.20.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2
@@ -91,6 +91,10 @@
 %doc README NEWS
 
 %changelog
+* Mon Feb  4 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 3:1.20.4-3
+- Fix ypbind startup fails because of timeout error in init script
+  Resolves: #430409
+
 * Mon Sep 17 2007 Steve Dickson <steved at redhat.com> - 3:1.20.4-2
 - Fixed a couple of typos in initscript (bz 281951)