rpms/ypbind/devel ypbind.init,1.19,1.20 ypbind.spec,1.47,1.48
Vitezslav Crhonek (vcrhonek)
fedora-extras-commits at redhat.com
Fri May 23 11:26:06 UTC 2008
Author: vcrhonek
Update of /cvs/extras/rpms/ypbind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24531
Modified Files:
ypbind.init ypbind.spec
Log Message:
Fix init script timing again
Index: ypbind.init
===================================================================
RCS file: /cvs/extras/rpms/ypbind/devel/ypbind.init,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ypbind.init 11 Jan 2008 22:28:15 -0000 1.19
+++ ypbind.init 23 May 2008 11:25:23 -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/devel/ypbind.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ypbind.spec 12 Feb 2008 09:51:40 -0000 1.47
+++ ypbind.spec 23 May 2008 11:25:23 -0000 1.48
@@ -1,7 +1,7 @@
Summary: The NIS daemon which binds NIS clients to an NIS domain.
Name: ypbind
Version: 1.20.4
-Release: 4%{?dist}
+Release: 5%{?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,9 @@
%doc README NEWS
%changelog
+* Wed May 21 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 3:1.20.4-5
+- Fix init script timing again
+
* Tue Feb 12 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 3:1.20.4-4
- Fix Buildroot
More information about the scm-commits
mailing list