From nobody Sat Jul 15 13:18:26 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R386p5Fvwz4nJmJ; Sat, 15 Jul 2023 13:18:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R386p4rgcz4298; Sat, 15 Jul 2023 13:18:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689427106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0hPJ0NmB2PoP7Tiav64SKnvG0rgLpxg/g2UaWZcehUg=; b=OpFlU1BtXrAfoQ75F0kZPPokeggJirNrOWBaez82blTUdNDVU77TFkgEqxPAHZU9kC2Uqx KTW3yxkq+6ythEm0K8r896k4fFQy16mzyN66fPz2XVEBxzPovubD5MxdRFBORsWNUEfc5o JHCbqUPMhzROGCeTshdBD5pr1IT9d8H5gY2jzIjxO2Z84HxAJJVbbbaFLQemaZ1q0GeQ8i aG44iCzk71vY5paQM/ba21PGQPXEzhqBxPTxiMLKhwe38qyUKU1k8Dftdvoc1jr4MOUUms mbWjUQG4dIjTjBxDlDbMBoOLE7EykqnFYoD9Aag/dddPDQ5iXi40Wn32vhoebA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689427106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0hPJ0NmB2PoP7Tiav64SKnvG0rgLpxg/g2UaWZcehUg=; b=u0bQU9wHDTqaIMfQr6sAowFdnOy9NVEJWGogaCJdK9mGJ3flV7xPxCh/+DEsFYUmQg19/t bRMsQ6h7/SbpZ0f9a1IWBRD8Ib3UskJMsDGv9rBYXY/dYOvMNXiC7kH6DqpN0TyezuZvgk MKxPxvg1qkukio8n/IZWchJu2jU3wnFd+7iMo/Wud09aaKYAbQr2g0zNQ+C2nx6d2nrSGz 7xbuXyyTxnoLyMLZtZusIIBTBNsUPcg7AdLto1WNuzbvV6FQ54shhwr5y91xg/BBp6IREP wXRYn05vkFsb8+gFMX4COWqwEMuHI1VYIRcGJrH1Vq828T2JSwPQBbELzlJnyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689427106; a=rsa-sha256; cv=none; b=mE3x6KiVSsHANVt0xN3hIfk/c4SN20mrSlLvTYXHqN5q0IKL8XgEq6sOeqcS+Vyk0BhcY5 R4ZynrhorZyKh0s3P48VMSLuPgM1I8qUvjIGxpuPeGHHubFsnFU7ojH97tA2p6zBLvX3tF /BgUtTiylumm0Zs7q4eoKxfz3Niki4cDBGmzQsXPa06Q+yPhuSD8CPilMLRHl1Bp6saAXC ynlWy0EiBnM5Hg1zkz+bIRZh1o2iw3xGzf99RUtETp0BVKxdQciShbna0lmrO4c+1TWwLk 3QJfcNe+nwfkKSEUZnxaEx+wxFrgayz9JWVbs5fWN2L0D+oami4vrYmgFaEL9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R386p3q3gz11hj; Sat, 15 Jul 2023 13:18:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36FDIQoB064428; Sat, 15 Jul 2023 13:18:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36FDIQ7M064427; Sat, 15 Jul 2023 13:18:26 GMT (envelope-from git) Date: Sat, 15 Jul 2023 13:18:26 GMT Message-Id: <202307151318.36FDIQ7M064427@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: 5ac2a874d070 - main - /etc/rc.subr: rename sysctl.conf.d to sysctl.kld.d List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ac2a874d070a0880dc0a264cb2230d7f1c19bea Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=5ac2a874d070a0880dc0a264cb2230d7f1c19bea commit 5ac2a874d070a0880dc0a264cb2230d7f1c19bea Author: Doug Rabson AuthorDate: 2023-07-15 07:40:50 +0000 Commit: Doug Rabson CommitDate: 2023-07-15 13:16:08 +0000 /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/.conf . +.Pf /etc/sysctl.kld.d/.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