Page MenuHomeFreeBSD
Files F108593366

D41043.id124711.diff
No OneTemporary
Actions

D41043.id124711.diff
View Options

diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -96,7 +96,7 @@
..
ssl
..
- sysctl.conf.d
+ sysctl.kld.d
..
syslog.d
..
diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr
--- a/libexec/rc/rc.subr
+++ b/libexec/rc/rc.subr
@@ -1970,8 +1970,8 @@
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
diff --git a/share/man/man5/sysctl.conf.5 b/share/man/man5/sysctl.conf.5
--- a/share/man/man5/sysctl.conf.5
+++ b/share/man/man5/sysctl.conf.5
@@ -54,10 +54,10 @@
.Pp
For kernel modules loaded via
.Xr rc.subr 8
-system ,
+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 @@
.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

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 27, 6:08 PM (5 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16203084
Default Alt Text
D41043.id124711.diff (1 KB)

Event Timeline