From 85e5be7453c07f29f96867ac66e23765700f1ded Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Dec 27 2007 14:47:47 +0000 Subject: - fixed initscript wait loop (#426382) --- diff --git a/bind.spec b/bind.spec index b2ae0d9..b2e9e31 100644 --- a/bind.spec +++ b/bind.spec @@ -21,7 +21,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: ISC Version: 9.5.0 -Release: 22.%{RELEASEVER}%{?dist} +Release: 23.%{RELEASEVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -416,7 +416,7 @@ for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.int echo '@ in soa localhost. root 1 3H 15M 1W 1D ns localhost.' > sample/var/named/$f; done -/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.240 2007/12/20 13:46:29 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\ +/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.241 2007/12/27 14:47:47 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\ *\ * NOTE: you only need to create this file if it is to\ * differ from the following default contents: @@ -660,6 +660,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_sbindir}/bind-chroot-admin %changelog +* Thu Dec 27 2007 Adam Tkac 32:9.5.0-23.b1 +- fixed initscript wait loop (#426382) + * Thu Dec 20 2007 Adam Tkac 32:9.5.0-22.b1 - fixed regression caused by libidn2 patch (#426348) diff --git a/named.init b/named.init index dff9a04..0629f2e 100755 --- a/named.init +++ b/named.init @@ -144,7 +144,7 @@ stop() { timeout=0 RETVAL=0 - while [ `/sbin/pidof -o %PPID "$named" >/dev/null` ]; do + while /sbin/pidof -o %PPID "$named" >/dev/null; do if [ $timeout -ge $NAMED_SHUTDOWN_TIMEOUT ]; then RETVAL=1 break