From owner-svn-src-all@freebsd.org Thu Jan 18 20:45:42 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF3E2EC21BA; Thu, 18 Jan 2018 20:45:42 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A73247FC8B; Thu, 18 Jan 2018 20:45:42 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D919923A5C; Thu, 18 Jan 2018 20:45:41 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0IKjf7K088803; Thu, 18 Jan 2018 20:45:41 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0IKjf44088801; Thu, 18 Jan 2018 20:45:41 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201801182045.w0IKjf44088801@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Thu, 18 Jan 2018 20:45:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r328136 - in head/etc: defaults rc.d X-SVN-Group: head X-SVN-Commit-Author: brd X-SVN-Commit-Paths: in head/etc: defaults rc.d X-SVN-Commit-Revision: 328136 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jan 2018 20:45:42 -0000 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 +}