diff options
| author |   Christian Ruppert <idl0r@gentoo.org> | 2011-06-16 18:56:09 +0000 |
|---|---|---|
| committer | Christian Ruppert <idl0r@gentoo.org> | 2011-06-16 18:56:09 +0000 |
| commit | 21d4984ce02dba8cf61adbc61befb4f16f125810 (patch) | |
| tree | 2c9799c25d607b2b8e78e63547fdead891cfd0b6 /net-dns | |
| parent | Revision bump. A timeout has been added to the fuser/mount check which can be... (diff) | |
| download | gentoo-2-21d4984ce02dba8cf61adbc61befb4f16f125810.tar.gz gentoo-2-21d4984ce02dba8cf61adbc61befb4f16f125810.tar.bz2 gentoo-2-21d4984ce02dba8cf61adbc61befb4f16f125810.zip | |
Make the init script POSIX conform again, bug 366431.
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
Diffstat (limited to 'net-dns')
| -rw-r--r-- | net-dns/bind/ChangeLog | 5 | ||||
| -rw-r--r-- | net-dns/bind/files/named.init-r11 | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog index f16d91c4ef98..cbb0339453a7 100644 --- a/net-dns/bind/ChangeLog +++ b/net-dns/bind/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-dns/bind # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.340 2011/06/16 18:54:12 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.341 2011/06/16 18:56:09 idl0r Exp $ + + 16 Jun 2011; Christian Ruppert <idl0r@gentoo.org> files/named.init-r11: + Make the init script POSIX conform again, bug 366431. *bind-9.8.0_p2-r1 (16 Jun 2011) diff --git a/net-dns/bind/files/named.init-r11 b/net-dns/bind/files/named.init-r11 index 23bf582645a6..15f744e84b08 100644 --- a/net-dns/bind/files/named.init-r11 +++ b/net-dns/bind/files/named.init-r11 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r11,v 1.1 2011/06/16 18:54:12 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r11,v 1.2 2011/06/16 18:56:09 idl0r Exp $ opts="start stop reload restart checkconfig checkzones" @@ -65,7 +65,7 @@ _umount() { _get_pidfile() { # as suggested in bug #107724, bug 335398#c17 [ -n "${PIDFILE}" ] || PIDFILE=${CHROOT}$(\ - /usr/sbin/named-checkconf -p ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF/${CHROOT}} | grep 'pid-file' | cut -d\" -f2) + /usr/sbin/named-checkconf -p ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} | grep 'pid-file' | cut -d\" -f2) [ -z "${PIDFILE}" ] && PIDFILE=${CHROOT}/var/run/named/named.pid } @@ -99,7 +99,7 @@ checkconfig() { return 1 fi - /usr/sbin/named-checkconf ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF/${CHROOT}} || { + /usr/sbin/named-checkconf ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} || { eerror "named-checkconf failed! Please fix your config first." return 1 } @@ -110,7 +110,7 @@ checkconfig() { checkzones() { ebegin "Checking named configuration and zones" - /usr/sbin/named-checkconf -z -j ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF/${CHROOT}} + /usr/sbin/named-checkconf -z -j ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} eend $? } |