d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Teach the resolv startup script to respect its enable flag.

Browse Source 
Reviewed by:	will, imp
Approved by:	imp
This commit is contained in:
Brad Davis 2018-01-18 20:45:41 +00:00
parent 7f513d17b2
commit 5b0065e7db
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=328136
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/defaults/rc.conf
View File

@ -96,6 +96,7 @@ fsck_y_enable="NO" # Set to YES to do fsck -y if the initial preen fails.
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 daemon.
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

28
etc/rc.d/resolv
View File

@ -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
}