Created attachment 223937 [details] Mention /etc/sysctl.conf.local Mention the existence of /etc/sysctl.conf.local, added in 4ceda705b7fd022f40e7405c4cb42b2b952e0943. Use a similar wording found in loader.conf(5).
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=46c99528078ad478f50910110a933abef0b89cde commit 46c99528078ad478f50910110a933abef0b89cde Author: Gordon Bergling <gbe@FreeBSD.org> AuthorDate: 2021-04-09 15:28:18 +0000 Commit: Gordon Bergling <gbe@FreeBSD.org> CommitDate: 2021-04-09 15:28:18 +0000 sysctl.conf(5): Mention sysctl.conf.local in the sysctl.conf(5) manual page The possibility of using a sysctl.conf.local on a machine that has a shared sysctl.conf(5) isn't documented. So mention the sysctl.conf.local in the manual page. PR: 254901 Submitted by: Jose Luis Duran <jlduran at gmail dot com> Reported by: Jose Luis Duran <jlduran at gmail dot com> Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D29673 share/man/man5/sysctl.conf.5 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
Committed, thanks for the patch.
A commit in branch stable/13 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=d33c99d27da24ca23d8e7d6b2b933eef6f9bfce9 commit d33c99d27da24ca23d8e7d6b2b933eef6f9bfce9 Author: Gordon Bergling <gbe@FreeBSD.org> AuthorDate: 2021-04-09 15:28:18 +0000 Commit: Gordon Bergling <gbe@FreeBSD.org> CommitDate: 2021-04-13 04:36:32 +0000 sysctl.conf(5): Mention sysctl.conf.local in the sysctl.conf(5) manual page The possibility of using a sysctl.conf.local on a machine that has a shared sysctl.conf(5) isn't documented. So mention the sysctl.conf.local in the manual page. PR: 254901 Submitted by: Jose Luis Duran <jlduran at gmail dot com> Reported by: Jose Luis Duran <jlduran at gmail dot com> Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D29673 (cherry picked from commit 46c99528078ad478f50910110a933abef0b89cde) share/man/man5/sysctl.conf.5 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
A commit in branch stable/12 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=fa5210b55a35ff217dec68b3cd25678447ad4f09 commit fa5210b55a35ff217dec68b3cd25678447ad4f09 Author: Gordon Bergling <gbe@FreeBSD.org> AuthorDate: 2021-04-09 15:28:18 +0000 Commit: Gordon Bergling <gbe@FreeBSD.org> CommitDate: 2021-04-13 04:37:54 +0000 sysctl.conf(5): Mention sysctl.conf.local in the sysctl.conf(5) manual page The possibility of using a sysctl.conf.local on a machine that has a shared sysctl.conf(5) isn't documented. So mention the sysctl.conf.local in the manual page. PR: 254901 Submitted by: Jose Luis Duran <jlduran at gmail dot com> Reported by: Jose Luis Duran <jlduran at gmail dot com> Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D29673 (cherry picked from commit 46c99528078ad478f50910110a933abef0b89cde) share/man/man5/sysctl.conf.5 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
MFC'ed to stable/12 and stable/13. Thanks for the patch!