d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

/etc/rc.subr: rename sysctl.conf.d to sysctl.kld.d

Browse Source 
This better reflects the intent that this directory is indexed by kld
name and removes a conflict with D32128 which aims to split sysctl.conf.

Reviewed by:	kevans imp
MFC after:	2 weeks
Differential Revision: https://reviews.freebsd.org/D41043
This commit is contained in:
Doug Rabson 2023-07-15 08:40:50 +01:00
parent 2a0c0aea42
commit 5ac2a874d0
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/mtree/BSD.root.dist
View File

@ -96,7 +96,7 @@
.. ..
ssl ssl
.. ..
sysctl.conf.d sysctl.kld.d
.. ..
syslog.d syslog.d
.. ..

4
libexec/rc/rc.subr
View File

@ -1970,8 +1970,8 @@ load_kld()
return 1 return 1
else else
info "$1 kernel module loaded." info "$1 kernel module loaded."
if [ -f "/etc/sysctl.conf.d/$1.conf" ]; then if [ -f "/etc/sysctl.kld.d/$1.conf" ]; then
sysctl -f "/etc/sysctl.conf.d/$1.conf" sysctl -f "/etc/sysctl.kld.d/$1.conf"
fi fi
fi fi
else else

6
share/man/man5/sysctl.conf.5
View File

@ -54,10 +54,10 @@ section, below.
.Pp .Pp
For kernel modules loaded via For kernel modules loaded via
.Xr rc.subr 8 .Xr rc.subr 8
system , system,
additional module-specific settings can be applied additional module-specific settings can be applied
by adding a file in the same format named by adding a file in the same format named
.Pf /etc/sysctl.d/<module name>.conf . .Pf /etc/sysctl.kld.d/<module name>.conf .
.Sh FILES .Sh FILES
.Bl -tag -width /etc/rc.d/sysctl_lastload -compact .Bl -tag -width /etc/rc.d/sysctl_lastload -compact
.It Pa /etc/rc.d/sysctl .It Pa /etc/rc.d/sysctl
@ -76,7 +76,7 @@ Initial settings for
.It Pa /etc/sysctl.conf.local .It Pa /etc/sysctl.conf.local
Machine-specific settings for sites with a common Machine-specific settings for sites with a common
.Pa /etc/sysctl.conf . .Pa /etc/sysctl.conf .
.It Pa /etc/sysctl.conf.d .It Pa /etc/sysctl.kld.d
Module specific settings for kernel modules loaded via Module specific settings for kernel modules loaded via
.Xr rc.subr 8 . .Xr rc.subr 8 .
.El .El