From 5ac2a874d070a0880dc0a264cb2230d7f1c19bea Mon Sep 17 00:00:00 2001
From: Doug Rabson <dfr@FreeBSD.org>
Date: Sat, 15 Jul 2023 08:40:50 +0100
Subject: [PATCH] /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
---
 etc/mtree/BSD.root.dist      | 2 +-
 libexec/rc/rc.subr           | 4 ++--
 share/man/man5/sysctl.conf.5 | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index 2ec079b0abd1..a81cd03050aa 100644
--- 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
index ef3da46b3206..0114dd5ca5a8 100644
--- a/libexec/rc/rc.subr
+++ b/libexec/rc/rc.subr
@@ -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
diff --git a/share/man/man5/sysctl.conf.5 b/share/man/man5/sysctl.conf.5
index 26ecf763ca12..1f769772dc9d 100644
--- a/share/man/man5/sysctl.conf.5
+++ b/share/man/man5/sysctl.conf.5
@@ -54,10 +54,10 @@ section, below.
 .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 @@ 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