From owner-svn-src-all@freebsd.org Thu Jan 18 20:55:07 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 79010EC2899 for ; Thu, 18 Jan 2018 20:55:07 +0000 (UTC) (envelope-from steven@multiplay.co.uk) Received: from mail-lf0-x231.google.com (mail-lf0-x231.google.com [IPv6:2a00:1450:4010:c07::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EC4CC804E7 for ; Thu, 18 Jan 2018 20:55:06 +0000 (UTC) (envelope-from steven@multiplay.co.uk) Received: by mail-lf0-x231.google.com with SMTP id t139so13604388lff.0 for ; Thu, 18 Jan 2018 12:55:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=multiplay-co-uk.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=wRcV0fna5Kij+xylQXjOgkiHNxpj8e74KtLiECMMgU0=; b=auCrydKPnFRtke/gVJeAoSReA85vlfYtaQKSB09P3lEFGjwTeq5L2kXszfrnSG5tfY qDjioYhFkd/5y+938oiYHsmK3ntSbxMXEwebGKONs3L5UEFHo8jaHyIGqSwOZPUfU9k2 6hXabAFV+CLBvbfenGS3+KMb2D7aMsd4fsUgXkbrTUgycnM60uqBPSfCAON37ZAN6UVx YMVDIVF3gKZ5bftyFnuHNsZ56kjidMER7naLz80jkWgxs3DGQlkofmujI4kguH7TUyob gslyNaDd3m07nW5gq+6RjFD3Rzh9un/0Ku56fsBVYwmgOpXI4eoH8Oqyo2xrjrzlfnZA KPHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=wRcV0fna5Kij+xylQXjOgkiHNxpj8e74KtLiECMMgU0=; b=ny46wj4aIWCIbZ15Gi2/DPkQvnSkF2BwopJaFEaW5wGLrbCJxcZHHSKeEz7SyvIb7m 2XaA+IORXdPN6A5yh+XGFB3ooxaxBhnC77RG9iXCB2x+c4qbsoZz/W77upqFzo9izESC 2Whcrjy133oDSi4q9O+vNIO6PvtUhFcbhd0E+eWk+wqUoUmb15KqnqRq8xTyNUry0AAm pDMHlnB1BV0iFairjs3QG5ZNIRIVXpHB8Ed6zVmaBfRPgHoBJblp97ZDnGORjFnlcq0p hHg0XocZTGwqR0MY3ZsymVnLu1UKyQHcpAVESTvC4RoSX2gujQOVW3IKsDWQIuuIvnPP Q93g== X-Gm-Message-State: AKwxytcZcSuTwPxL2sd8um7GfFVkmx0MRTTqbhQqQuqGvC8rb0woE+Jo M31azGpUcr1NMAxBpCd0ZtwZzXg8TmJFGrNpqxnjig== X-Google-Smtp-Source: ACJfBosmCFx8zUu03E+Fe/tAzreiITB+3XyhL6DVtMWje8x/62hyVjdCYUY5yF1GCrcFBudwmIymsiFqRPYqtYzGn8I= X-Received: by 10.25.81.200 with SMTP id g69mr16120471lfl.19.1516308904232; Thu, 18 Jan 2018 12:55:04 -0800 (PST) MIME-Version: 1.0 References: <201801182045.w0IKjf44088801@repo.freebsd.org> In-Reply-To: <201801182045.w0IKjf44088801@repo.freebsd.org> From: Steven Hartland Date: Thu, 18 Jan 2018 20:54:53 +0000 Message-ID: Subject: Re: svn commit: r328136 - in head/etc: defaults rc.d To: Brad Davis Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.25 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:55:07 -0000 Did you intend to add the growfs option at the same time as it wasn=E2=80= =99t mentioned in the commit msg On Thu, 18 Jan 2018 at 20:46, Brad Davis 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 > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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=3D"NO" # Set to YES to do fsck -y if t= he i > fsck_y_flags=3D"-T ffs:-R -T ufs:-R" # Additional flags for fsck -y > background_fsck=3D"YES" # Attempt to run fsck in the background where > possible. > background_fsck_delay=3D"60" # Time to wait (seconds) before starting th= e > fsck. > +growfs_enable=3D"NO" # Set to YES to attempt to grow the root > filesystem on boot > netfs_types=3D"nfs:NFS smbfs:SMB" # Net filesystems. > extra_netfs_types=3D"NO" # List of network extra filesystem types for > delayed > # mount at startup (or NO). > @@ -276,6 +277,7 @@ ctld_enable=3D"NO" # CAM Target Layer / iS= CSI > target da > local_unbound_enable=3D"NO" # local caching resolver > blacklistd_enable=3D"NO" # Run blacklistd daemon (YES/NO). > blacklistd_flags=3D"" # Optional flags for blacklistd(8). > +resolv_enable=3D"YES" # Enable resolv / resolvconf > > # > # kerberos. Do not run the admin daemons on slave servers > > Modified: head/etc/rc.d/resolv > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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=3D"resolv" > desc=3D"Create /etc/resolv.conf from kenv" > +start_cmd=3D"${name}_start" > stop_cmd=3D':' > > 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=3D"`/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`" ]; th= en > + interface=3D"`/bin/kenv boot.netif.name`" > + ( > + if [ -n "`/bin/kenv dhcp.domain-name 2> /dev/null`" ]; th= en > + echo domain `/bin/kenv dhcp.domain-name` > + fi > + > + set -- `/bin/kenv dhcp.domain-name-servers` > + for ns in `IFS=3D','; echo $*`; do > + echo nameserver $ns > + done > + ) | /sbin/resolvconf -a ${interface}:dhcp4 > fi > - > - set -- `/bin/kenv dhcp.domain-name-servers` > - for ns in `IFS=3D','; echo $*`; do > - echo nameserver $ns > - done > - ) | /sbin/resolvconf -a ${interface}:dhcp4 > -fi > +} > > >