rpms/bind
5
0
Fork 1
Code Issues Pull Requests Releases Activity

Fix "service named status" and don't check MD5, size and mtime of sysconfig/named.

Browse Source 
Signed-off-by: Adam Tkac <atkac@redhat.com>
This commit is contained in:
Adam Tkac 2011-01-06 15:12:00 +01:00
parent d4ce1d893b
commit 559263dd25
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bind.spec
View File

@ -22,7 +22,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind Name: bind
License: ISC License: ISC
Version: 9.7.3 Version: 9.7.3
Release: 0.2.%{PREVER}%{?dist} Release: 0.3.%{PREVER}%{?dist}
Epoch: 32 Epoch: 32
Url: http://www.isc.org/products/BIND/ Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -605,7 +605,7 @@ rm -rf ${RPM_BUILD_ROOT}
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/bind %{_libdir}/bind
%config(noreplace) %{_sysconfdir}/sysconfig/named %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sysconfig/named
%config(noreplace) %attr(-,root,named) %{_sysconfdir}/named.iscdlv.key %config(noreplace) %attr(-,root,named) %{_sysconfdir}/named.iscdlv.key
%config(noreplace) %attr(-,root,named) %{_sysconfdir}/named.root.key %config(noreplace) %attr(-,root,named) %{_sysconfdir}/named.root.key
%{_sysconfdir}/tmpfiles.d/named.conf %{_sysconfdir}/tmpfiles.d/named.conf
@ -766,6 +766,10 @@ rm -rf ${RPM_BUILD_ROOT}
%endif %endif
%changelog %changelog
* Thu Jan 06 2011 Adam Tkac <atkac redhat com> 32:9.7.3-0.3.b1
- fix "service named status" when used with named-sdb
- don't check MD5, size and mtime of sysconfig/named
* Wed Jan 05 2011 Adam Tkac <atkac redhat com> 32:9.7.3-0.2.b1 * Wed Jan 05 2011 Adam Tkac <atkac redhat com> 32:9.7.3-0.2.b1
- add new option DISABLE_ZONE_CHECKING to sysconfig/named - add new option DISABLE_ZONE_CHECKING to sysconfig/named

12
named.init
View File

@ -42,6 +42,8 @@ if [ -n "$ROOTDIR" ]; then
fi; fi;
fi fi
PIDFILE="/var/run/named/named.pid"
ROOTDIR_MOUNT='/etc/named /etc/pki/dnssec-keys /var/named /etc/named.conf ROOTDIR_MOUNT='/etc/named /etc/pki/dnssec-keys /var/named /etc/named.conf
/etc/named.dnssec.keys /etc/named.rfc1912.zones /etc/rndc.conf /etc/rndc.key /etc/named.dnssec.keys /etc/named.rfc1912.zones /etc/rndc.conf /etc/rndc.key
/usr/lib64/bind /usr/lib/bind /etc/named.iscdlv.key /etc/named.root.key' /usr/lib64/bind /usr/lib/bind /etc/named.iscdlv.key /etc/named.root.key'
@ -85,7 +87,7 @@ umount_chroot_conf()
} }
pidofnamed() { pidofnamed() {
pidofproc -p "$ROOTDIR/var/run/named/named.pid" "$named"; pidofproc -p "$ROOTDIR/$PIDFILE" "$named";
} }
# Check if all what named needs running # Check if all what named needs running
@ -143,11 +145,11 @@ start()
# check if configuration is correct # check if configuration is correct
if [ -x /usr/sbin/named-checkconf ] && [ -x /usr/sbin/named-checkzone ] && /usr/sbin/named-checkconf $ckcf_options ${named_conf} >/dev/null 2>&1; then if [ -x /usr/sbin/named-checkconf ] && [ -x /usr/sbin/named-checkzone ] && /usr/sbin/named-checkconf $ckcf_options ${named_conf} >/dev/null 2>&1; then
daemon --pidfile "$ROOTDIR/var/run/named/named.pid" /usr/sbin/"$named" -u named ${OPTIONS}; daemon --pidfile "$ROOTDIR/$PIDFILE" /usr/sbin/"$named" -u named ${OPTIONS};
RETVAL=$? RETVAL=$?
if [ $RETVAL -eq 0 ]; then if [ $RETVAL -eq 0 ]; then
rm -f /var/run/{named,named-sdb}.pid; rm -f /var/run/{named,named-sdb}.pid;
ln -s $ROOTDIR/var/run/named/"$named".pid /var/run/"$named".pid; ln -s $ROOTDIR/"$PIDFILE" /var/run/"$named".pid;
fi; fi;
else else
@ -180,7 +182,7 @@ stop() {
RETVAL=$? RETVAL=$?
# was rndc successful? # was rndc successful?
[ "$RETVAL" -eq 0 ] || \\ [ "$RETVAL" -eq 0 ] || \\
killproc -p "$ROOTDIR/var/run/named/named.pid" "$named" -TERM >/dev/null 2>&1 killproc -p "$ROOTDIR/$PIDFILE" "$named" -TERM >/dev/null 2>&1
timeout=0 timeout=0
RETVAL=0 RETVAL=0
@ -215,7 +217,7 @@ stop() {
rhstatus() { rhstatus() {
[ -x /usr/sbin/rndc ] && /usr/sbin/rndc status; [ -x /usr/sbin/rndc ] && /usr/sbin/rndc status;
status /usr/sbin/"$named"; status -p "$ROOTDIR/$PIDFILE" /usr/sbin/"$named";
return $? return $?
} }
restart() { restart() {