summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Stransky <stransky@fedoraproject.org>2006-10-05 11:14:27 +0000
committerMartin Stransky <stransky@fedoraproject.org>2006-10-05 11:14:27 +0000
commitf0295fac62ba6d346cb49a3f4758e0fd857a9448 (patch)
treeb921e4d318d7c79442c4c773798ef80a0f5c150d
parentb7b4b2cf6d238e2319a8fea34e1dfc04c92d1eea (diff)
fix for Bind Init Script does not create the PID file always, work in
progress version
-rw-r--r--bind.spec8
-rwxr-xr-xnamed.init10
2 files changed, 16 insertions, 2 deletions
diff --git a/bind.spec b/bind.spec
index b36bd90..5a5426c 100644
--- a/bind.spec
+++ b/bind.spec
@@ -18,7 +18,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind
License: BSD-like
Version: 9.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 30
Url: http://www.isc.org/products/BIND/
Buildroot: %{_tmppath}/%{name}-root
@@ -454,7 +454,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.131 2006/10/02 13:54:47 stransky 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.132 2006/10/05 11:14:27 stransky 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:
@@ -782,6 +782,10 @@ rm -rf ${RPM_BUILD_ROOT}
:;
%changelog
+* Thu Oct 5 2006 Martin Stransky <stransky@redhat.com> - 30:9.3.3-3
+- added fix from #209400 - Bind Init Script does not create
+ the PID file always, created by Jeff Means
+
* Mon Oct 2 2006 Martin Stransky <stransky@redhat.com> - 30:9.3.3-2
- removed chcon from post script, replaced by restorecon
(Bug 202547, comment no. 37)
diff --git a/named.init b/named.init
index 23f4faa..d5aa418 100755
--- a/named.init
+++ b/named.init
@@ -162,6 +162,16 @@ start() {
ln -s $ROOTDIR/var/run/named/named.pid /var/run/named_sdb.pid;
fi;
fi;
+ if [ -n "`/sbin/pidof -o %PPID $named`" ]; then
+ # Verify that named actually started (JM 2006-10-04)
+ if [ ! -e $ROOTDIR/var/run/named/named.pid ]; then
+ # If there is not a file containing the PID of the now running named daemon then create it (JM 2006-10-04)
+ echo `/sbin/pidof -o %PPID $named` > $ROOTDIR/var/run/named/named.pid;
+ if [ "$named" = "named_sdb" ]; then
+ echo `/sbin/pidof -o %PPID $named` > $ROOTDIR/var/run/named/named_sdb.pid;
+ fi;
+ fi;
+ fi;
else
named_err="`/usr/sbin/named-checkconf $ckcf_options $named_conf 2>&1`";
echo