From 547f12bcc6fc92f8c3ac963ce028e4dc6a075e67 Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Wed, 14 Sep 2011 15:48:50 +0000 Subject: Remove deprecated opts variable as well as --oknodo. (Portage version: 2.2.0_alpha56/cvs/Linux x86_64) --- net-dns/bind/ChangeLog | 5 ++++- net-dns/bind/files/named.init-r11 | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'net-dns/bind') diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog index dae4f31ef8e1..ea186cb5ddb9 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.353 2011/09/10 12:38:06 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.354 2011/09/14 15:48:50 idl0r Exp $ + + 14 Sep 2011; Christian Ruppert files/named.init-r11: + Remove deprecated opts variable as well as --oknodo. 10 Sep 2011; Christian Ruppert bind-9.8.1.ebuild, +files/bind-9.8.1-sdlz_helper.patch: diff --git a/net-dns/bind/files/named.init-r11 b/net-dns/bind/files/named.init-r11 index 15f744e84b08..8432ff00e107 100644 --- a/net-dns/bind/files/named.init-r11 +++ b/net-dns/bind/files/named.init-r11 @@ -1,9 +1,10 @@ #!/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.2 2011/06/16 18:56:09 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r11,v 1.3 2011/09/14 15:48:50 idl0r Exp $ -opts="start stop reload restart checkconfig checkzones" +extra_commands="checkconfig checkzones" +extra_started_commands="reload" depend() { need net @@ -235,8 +236,7 @@ reload() { _get_pidfile if [ -n "${PIDFILE}" ]; then - # FIXME: Remove --stop and --oknodo as soon as baselayout-1 has been removed... finally... - start-stop-daemon --stop --oknodo --pidfile $PIDFILE --signal HUP --exec /usr/sbin/named + start-stop-daemon --pidfile $PIDFILE --signal HUP ret=$? else ewarn "Unable to determine the pidfile... this is" -- cgit v1.2.3-65-gdbad