/etc/rc.subr: rename sysctl.conf.d to sysctl.kld.d
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:
parent
2a0c0aea42
commit
5ac2a874d0
@ -96,7 +96,7 @@
|
||||
..
|
||||
ssl
|
||||
..
|
||||
sysctl.conf.d
|
||||
sysctl.kld.d
|
||||
..
|
||||
syslog.d
|
||||
..
|
||||
|
@ -1970,8 +1970,8 @@ load_kld()
|
||||
return 1
|
||||
else
|
||||
info "$1 kernel module loaded."
|
||||
if [ -f "/etc/sysctl.conf.d/$1.conf" ]; then
|
||||
sysctl -f "/etc/sysctl.conf.d/$1.conf"
|
||||
if [ -f "/etc/sysctl.kld.d/$1.conf" ]; then
|
||||
sysctl -f "/etc/sysctl.kld.d/$1.conf"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
|
@ -57,7 +57,7 @@ For kernel modules loaded via
|
||||
system,
|
||||
additional module-specific settings can be applied
|
||||
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
|
||||
.Bl -tag -width /etc/rc.d/sysctl_lastload -compact
|
||||
.It Pa /etc/rc.d/sysctl
|
||||
@ -76,7 +76,7 @@ Initial settings for
|
||||
.It Pa /etc/sysctl.conf.local
|
||||
Machine-specific settings for sites with a common
|
||||
.Pa /etc/sysctl.conf .
|
||||
.It Pa /etc/sysctl.conf.d
|
||||
.It Pa /etc/sysctl.kld.d
|
||||
Module specific settings for kernel modules loaded via
|
||||
.Xr rc.subr 8 .
|
||||
.El
|
||||
|
Loading…
Reference in New Issue
Block a user