Page MenuHomeFreeBSD
Files F158002422

D56898.id177521.diff
No OneTemporary
Actions

D56898.id177521.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
@@ -105,6 +105,8 @@
untrusted tags=package=caroot
..
..
+ sysctl.conf.d tags=package=rc
+ ..
sysctl.kld.d tags=package=rc
..
syslog.d tags=package=syslogd
diff --git a/libexec/rc/rc.d/sysctl b/libexec/rc/rc.d/sysctl
--- a/libexec/rc/rc.d/sysctl
+++ b/libexec/rc/rc.d/sysctl
@@ -26,7 +26,7 @@
;;
esac
- for _f in /etc/sysctl.conf /etc/sysctl.conf.local; do
+ for _f in /etc/sysctl.conf /etc/sysctl.conf.local /etc/sysctl.conf.d/*.conf; do
if [ -r ${_f} ]; then
${command} ${command_args} ${_f} > /dev/null
fi
diff --git a/sbin/sysctl/sysctl.conf b/sbin/sysctl/sysctl.conf
--- a/sbin/sysctl/sysctl.conf
+++ b/sbin/sysctl/sysctl.conf
@@ -1,7 +1,10 @@
#
-# This file is read when going to multi-user and its contents piped thru
-# ``sysctl'' to adjust kernel values. ``man 5 sysctl.conf'' for details.
+# Refer to sysctl.conf(5) and sysctl(8) man pages for details on how to
+# configure kernel state.
#
+# The contents of /etc/sysctl.conf, /etc/sysctl.conf.local and any .conf
+# file(s) in the directory /etc/sysctl.conf.d are read when the system
+# transitions to multi-user operation, and piped through to sysctl(8).
# Uncomment this to prevent users from seeing information about processes that
# are being run under another UID.
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
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd June 30, 2022
+.Dd May 10, 2026
.Dt SYSCTL.CONF 5
.Os
.Sh NAME
@@ -74,6 +74,10 @@
.It Pa /etc/sysctl.conf.local
Machine-specific settings for sites with a common
.Pa /etc/sysctl.conf .
+.It Pa /etc/sysctl.conf.d
+Directory for modularized
+.Xr sysctl 8
+files.
.It Pa /etc/sysctl.kld.d
Module specific settings for kernel modules loaded via
.Xr rc.subr 8 .

File Metadata

Mime Type
text/plain
Expires
Thu, May 28, 9:18 AM (13 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33582221
Default Alt Text
D56898.id177521.diff (2 KB)

Event Timeline