conf/160960: [patch] /etc/rc.d/named

[Dmitry N Fomin]

The following reply was made to PR conf/160960; it has been noted by GNATS.

From: "Dmitry N Fomin" <fdn at okbire.ru>
To: FreeBSD-gnats-submit at freebsd.org, freebsd-bugs at freebsd.org
Cc:  
Subject: Re: conf/160960: [patch]  /etc/rc.d/named
Date: Fri, 23 Dec 2011 00:13:21 +0300

 Somebody can confirm this problem and try patch?
 Thanks.
 
 --- /usr/src/etc/rc.d/named	2010-12-21 17:09:25.000000000 +0000
 +++ /usr/src/etc/rc.d/named	2011-09-24 08:55:27.000000000 +0000
 @@ -100,9 +100,22 @@
  	make_symlinks
  
  	if checkyesno named_wait; then
 -		until ${command%/sbin/named}/bin/host $named_wait_host >/dev/null 2>&1; do
 -			echo "	Waiting for nameserver to resolve $named_wait_host"
 +		if [ -z "${named_wait_timeout}" ]; then
 +			named_wait_timeout="10"
 +		fi
 +		local timeout="${named_wait_timeout}"
 +		until ${command%/sbin/named}/bin/host -W 1 $named_wait_host >/dev/null 2>&1; do
 +			if [ $timeout -eq $named_wait_timeout ]; then
 +				echo "	Waiting for nameserver to resolve $named_wait_host"
 +				echo ""
 +			fi
  			sleep 1
 +			timeout=$(($timeout - 1))
 +			echo -e "\033[A	Remains to wait time - ${timeout} sec."
 +			if [ $timeout -le 0 ]; then
 +				echo "	Wait time (${named_wait_timeout} sec.) has effused."
 +				break
 +			fi
  		done
  	fi
  }
 
 --- /usr/src/etc/defaults/rc.conf	2010-12-21 17:09:25.000000000 +0000
 +++ /usr/src/etc/defaults/rc.conf	2011-09-23 18:43:44.000000000 +0000
 @@ -279,6 +279,7 @@
  named_symlink_enable="YES"	# Symlink the chrooted pid file
  named_wait="NO" 		# Wait for working name service before exiting
  named_wait_host="localhost" 	# Hostname to check if named_wait is enabled
 +named_wait_timeout="10"		# Timeout in seconds if named_wait is enabled
  named_auto_forward="NO" 	# Set up forwarders from /etc/resolv.conf
  named_auto_forward_only="NO" 	# Do "forward only" instead of "forward first"