Date: Thu, 18 Jan 2018 20:54:53 +0000 From: Steven Hartland <steven.hartland@multiplay.co.uk> 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: <CAHEMsqa9OW94iWZq1=xmd3w07f3sQegA9o87EL2b6Exog3-CEg@mail.gmail.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
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 <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 > > =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 > +} > > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAHEMsqa9OW94iWZq1=xmd3w07f3sQegA9o87EL2b6Exog3-CEg>