rpms/ypbind/F-8 ypbind.init,1.19,1.20 ypbind.spec,1.45,1.46
Vitezslav Crhonek (vcrhonek)
fedora-extras-commits at redhat.com
Fri May 23 12:38:04 UTC 2008
Author: vcrhonek
Update of /cvs/extras/rpms/ypbind/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv642
Modified Files:
ypbind.init ypbind.spec
Log Message:
Fix init script timing again
Index: ypbind.init
===================================================================
RCS file: /cvs/extras/rpms/ypbind/F-8/ypbind.init,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ypbind.init 4 Feb 2008 16:06:24 -0000 1.19
+++ ypbind.init 23 May 2008 12:37:20 -0000 1.20
@@ -82,29 +82,23 @@
# even when we are really not bound yet to a server, and then things
# that need NIS fail.
timeout=10
- failure=0
- while [ $timeout -gt 0 ]; do
+ firsttime=1
+ SECONDS=0
+ while [ $SECONDS -lt $timeout ]; do
if /usr/sbin/rpcinfo -p | LC_ALL=C fgrep -q ypbind
then
- if [ $failure -eq 1 ]; then
+ if [ $firsttime -eq 1 ]; then
# reset timeout
timeout=$NISTIMEOUT
- failure=0
+ firsttime=0
fi
/usr/bin/ypwhich > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -eq 0 ]; then
+ 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
fi
+ sleep 2
echo -n "..."
done
if [ $RETVAL -eq 0 ]; then
Index: ypbind.spec
===================================================================
RCS file: /cvs/extras/rpms/ypbind/F-8/ypbind.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ypbind.spec 4 Feb 2008 16:06:24 -0000 1.45
+++ ypbind.spec 23 May 2008 12:37:20 -0000 1.46
@@ -1,7 +1,7 @@
Summary: The NIS daemon which binds NIS clients to an NIS domain.
Name: ypbind
Version: 1.20.4
-Release: 3%{?dist}
+Release: 4%{?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
+* Fri May 23 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 3:1.20.4-4
+- Fix init script timing again
+ Resolves: #446356
+
* 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
More information about the scm-commits
mailing list