Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Feb 2018 11:52:02 +0100
From:      Emmanuel Vadot <manu@bidouilliste.com>
To:        Brad Davis <brd@FreeBSD.org>
Cc:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   Re: svn commit: r328136 - in head/etc: defaults rc.d
Message-ID:  <20180212115202.414ce229077525da98716595@bidouilliste.com>
In-Reply-To: <201801182045.w0IKjf44088801@repo.freebsd.org>
References:  <201801182045.w0IKjf44088801@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, 18 Jan 2018 20:45:41 +0000 (UTC)
Brad Davis <brd@FreeBSD.org> wrote:

> Author: brd (doc,ports committer)
> Date: Thu Jan 18 20:45:41 2018
> New Revision: 328136
> URL: https://svnweb.freebsd.org/changeset/base/328136
> 
> Log:
>   Teach the resolv startup script to respect its enable flag.
>   
>   Reviewed by:	will, imp
>   Approved by:	imp
> 
> Modified:
>   head/etc/defaults/rc.conf
>   head/etc/rc.d/resolv
> 
> Modified: head/etc/defaults/rc.conf
> ==============================================================================
> --- head/etc/defaults/rc.conf	Thu Jan 18 20:12:12 2018	(r328135)
> +++ head/etc/defaults/rc.conf	Thu Jan 18 20:45:41 2018	(r328136)
> @@ -96,6 +96,7 @@ fsck_y_enable="NO"	# Set to YES to do fsck -y if the i
>  fsck_y_flags="-T ffs:-R -T ufs:-R"	# Additional flags for fsck -y
>  background_fsck="YES"	# Attempt to run fsck in the background where possible.
>  background_fsck_delay="60" # Time to wait (seconds) before starting the fsck.
> +growfs_enable="NO"	# Set to YES to attempt to grow the root filesystem on boot
>  netfs_types="nfs:NFS smbfs:SMB" # Net filesystems.
>  extra_netfs_types="NO"	# List of network extra filesystem types for delayed
>  			# mount at startup (or NO).
> @@ -276,6 +277,7 @@ ctld_enable="NO"		# CAM Target Layer / iSCSI target da
>  local_unbound_enable="NO"	# local caching resolver
>  blacklistd_enable="NO" 	# Run blacklistd daemon (YES/NO).
>  blacklistd_flags=""		# Optional flags for blacklistd(8).
> +resolv_enable="YES"		# Enable resolv / resolvconf
>  
>  #
>  # kerberos. Do not run the admin daemons on slave servers
> 
> Modified: head/etc/rc.d/resolv
> ==============================================================================
> --- head/etc/rc.d/resolv	Thu Jan 18 20:12:12 2018	(r328135)
> +++ head/etc/rc.d/resolv	Thu Jan 18 20:45:41 2018	(r328136)
> @@ -35,6 +35,7 @@
>  
>  name="resolv"
>  desc="Create /etc/resolv.conf from kenv"
> +start_cmd="${name}_start"
>  stop_cmd=':'
>  
>  load_rc_config $name
> @@ -42,17 +43,20 @@ load_rc_config $name
>  # if the info is available via dhcp/kenv
>  # build the resolv.conf
>  #
> -if [ -n "`/bin/kenv dhcp.domain-name-servers 2> /dev/null`" ]; then
> -	interface="`/bin/kenv boot.netif.name`"
> -	(
> -	if [ -n "`/bin/kenv dhcp.domain-name 2> /dev/null`" ]; then
> -		echo domain `/bin/kenv dhcp.domain-name`
> +resolv_start()
> +{
> +	if [ -n "`/bin/kenv dhcp.domain-name-servers 2> /dev/null`" ]; then
> +		interface="`/bin/kenv boot.netif.name`"
> +		(
> +		if [ -n "`/bin/kenv dhcp.domain-name 2> /dev/null`" ]; then
> +			echo domain `/bin/kenv dhcp.domain-name`
> +		fi
> +	
> +		set -- `/bin/kenv dhcp.domain-name-servers`
> +		for ns in `IFS=','; echo $*`; do
> +			echo nameserver $ns
> +		done
> +		) | /sbin/resolvconf -a ${interface}:dhcp4
>  	fi
> -
> -	set -- `/bin/kenv dhcp.domain-name-servers`
> -	for ns in `IFS=','; echo $*`; do
> -		echo nameserver $ns
> -	done
> -	) | /sbin/resolvconf -a ${interface}:dhcp4
> -fi
> +}
>  

 I don't understand how it can work without.

 run_rc_command "$1"

-- 
Emmanuel Vadot <manu@bidouilliste.com> <manu@freebsd.org>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180212115202.414ce229077525da98716595>