From 90b2384a0ca8b4605933c561a019810053b048d9 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Sep 05 2007 09:56:24 +0000 Subject: - initscript failure message is now printed correctly (#277981, Quentin Armitage (quentin armitage org uk) ) --- diff --git a/bind.spec b/bind.spec index 338067b..f028c21 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: 11.2.%{RELEASEVER}%{?dist} +Release: 11.3.%{RELEASEVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -404,7 +404,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.212 2007/09/03 08:23:14 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.213 2007/09/05 09:56:24 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: @@ -646,6 +646,10 @@ rm -rf ${RPM_BUILD_ROOT} %{_sbindir}/bind-chroot-admin %changelog +* Wed Sep 05 2007 Adam Tkac 32:9.5.0-11.3.a6 +- initscript failure message is now printed correctly (#277981, + Quentin Armitage (quentin armitage org uk) ) + * Mon Sep 03 2007 Adam Tkac 32:9.5.0-11.2.a6 - temporary revert ISC 2119 change and add "libbind-errno" patch (#254501) again diff --git a/named.init b/named.init index 4b1e5a1..0de842b 100755 --- a/named.init +++ b/named.init @@ -137,12 +137,12 @@ start() [ -x /usr/bin/logger ] && echo "$named_err" | /usr/bin/logger -pdaemon.error -tnamed; exit 2; fi; + echo if [ $RETVAL -eq 0 ]; then touch /var/lock/subsys/named; else exit 7; fi - echo return 0; }