svn commit: r348012 - in stable/12: libexec/rc sbin/ifconfig share/man/man5 tools/tools/tinybsd/conf/firewall/etc usr.sbin/jail

[John Baldwin]

On 5/20/19 6:30 PM, Rodney W. Grimes wrote:
>> Author: brooks
>> Date: Mon May 20 21:33:22 2019
>> New Revision: 348012
>> URL: https://svnweb.freebsd.org/changeset/base/348012
>>
>> Log:
>>   MFC r347963:
>>   
>>   Change ed(4), ep(4), and fxp(4) examples to em(4).
>>   
>>   ed(4) and ep(4) will be removed in FreeBSD 13. fxp(4) remains
>>   popular in older systems, but isn't as future proof as em(4).
>>   
>>   Reviewed by:	bz, jhb
>>   Differential Revision:	https://reviews.freebsd.org/D20311
> 
> Though this made since to me in head, it does not in stable,
> as you may of just broke someones running system when they
> do a merge master if they happened to of depended on the very
> long standing defaults of fxp that are NOT in comment lines
> below.
> 
> IMHO we should not change user visible defaults
> in /etc/defaults/rc.conf on a brance, mininal is
> this requires some form of merge master update notice
> mechanism which we do not have.

While I agree with the sentiment, the fact that these values are set is just
broken.  The ones that aren't already comments should be fixed to be comments
in HEAD at least.  I think it is safe to merge all of the changes that aren't
uncommented lines in rc.conf though.

-- 
John Baldwin