From nobody Sun Jun 28 09:43:52 2026 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 4gp4HF06mQz6jw3w for ; Sun, 28 Jun 2026 09:43:53 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gp4HD66DKz3dmj for ; Sun, 28 Jun 2026 09:43:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782639832; 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=C45v9a8OvFxO1rcsXvl0tXjPRGJeDT3MmvwcgIiAu5w=; b=SkZ0Tz3wwx/YMSZErd1MnJRxdJVB1zECZP3V0ag1TbLHSNmuk/Hu3l9bJssQSErkMqy3fi rjcxgMxFjjYiOAhKyZ1qooYgUFTRIFvm4TqVlHyWfTLxLMBkaaHQFAidD5zppHARb/9fEk MT2wfqzlFdeEsj09L1brqbQcNMFIFT10na+15Y3zIInq19AWOAkcOfuZo2f7D4f1aGZONg 2X+S2d2jc4M+cHyglDoUBHP7wpvpSC48k7liwMe4W1BS89NDiucbLBCop9OxqJ+embDWhy n0zGEGpMD0DXf6HNpPiY5GW8VGsLam0uqX0YUGQxK91JJHRavfjhYAsnRYwMoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782639832; a=rsa-sha256; cv=none; b=oqBTX8t1+z96g/5dhDVoSgo2r3LYWpwHmEOQfSQujFJGtLGJsy5eZeVEb1m0TTYMhOaJvc tdMMrL7+1s3uAc8bcMLXA6nVlKUrz543KbGhbRJxHbGZB2jqdTy8QoASWu/Hm9+AlYBxP+ u+VWYuJRvaZuX5euTOW/6vsGwjDaPc9cieeFoNJGqer8hsRiTLWZHcv7AS1KNur0ZybNpB CCTv3CNSi8p5Bs0LEldNMP6b/ZbrasI/qhBsAARY9kag9bFY88CsUl7YgZ6PSiJtbnXvpn TDvUujYAYrsquZCH0lFepCB154zkex0hpjzS65qbtcltp9c8YfS5TsXZkPtLGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782639832; 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=C45v9a8OvFxO1rcsXvl0tXjPRGJeDT3MmvwcgIiAu5w=; b=IkvtDTjfkGwZ4lguwP6taZYorIp3YDpW9oKrbFoCnNA3qPn1rgMvut/mkOAu8bMpCFSds9 0HaoYCXnBBhu7JWaJrjAyBM0A8NZmV3DTsfOWVG1ZYHi6yNeMiZ/R1HDRxdDSvLJTA6NMD nLeRGw5QQszhoD6lvMJ9fEgaGqKhvCCitOFQ9J6t+Zhi/l5IyFKxKwS9zt+zXdLwb2SkYw fYmUhLVizNQPo87ruREWQpmX1XpaSSaR5lJgxJx6b+FA51GNLpyeyrH1sw8dOm/pyBzJph 5AV1lNKfz476d907wt5P9EgbxK/Da/Hfferju3A1wRh4cMfPdLoyQsINEvZr0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gp4HD4bF5z140r for ; Sun, 28 Jun 2026 09:43:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3026c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 09:43:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 2baf97f3305a - stable/15 - rc: Improve load_kld 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2baf97f3305a89c1211566c6ba38815e0af5412f Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 09:43:52 +0000 Message-Id: <6a40ecd8.3026c.6b04f785@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2baf97f3305a89c1211566c6ba38815e0af5412f commit 2baf97f3305a89c1211566c6ba38815e0af5412f Author: Dag-Erling Smørgrav AuthorDate: 2026-06-23 15:23:30 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-28 09:43:39 +0000 rc: Improve load_kld * Centralize the usage message. * Document and enforce that -e and -m are mutually exclusive; previously, speficying both would result in only -e being applied. * If -e was not specified, and -m was not specified or did not match, fall back to `kldstat -n file` which will always work for modules that aren't built into the kernel. This means the kld and ntpd scripts can now rely on load_kld to dtrt. MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D57706 (cherry picked from commit a95d324dd3107afcbc16767d183acca7a57ebca9) --- libexec/rc/rc.d/kld | 6 ++++-- libexec/rc/rc.d/ntpd | 2 +- libexec/rc/rc.subr | 27 ++++++++++++++------------- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/libexec/rc/rc.d/kld b/libexec/rc/rc.d/kld index 37b14255abb9..851db5dd6a32 100755 --- a/libexec/rc/rc.d/kld +++ b/libexec/rc/rc.d/kld @@ -44,10 +44,12 @@ kld_start() local _kld - echo 'Loading kernel modules:' $kld_list + startmsg -n "Loading kernel modules:" for _kld in $kld_list ; do - load_kld -e ${_kld}.ko $_kld + load_kld $_kld + startmsg -n " ${_kld}" done + startmsg "." } load_rc_config $name diff --git a/libexec/rc/rc.d/ntpd b/libexec/rc/rc.d/ntpd index e7e42da8acc7..a46a32144cce 100755 --- a/libexec/rc/rc.d/ntpd +++ b/libexec/rc/rc.d/ntpd @@ -67,7 +67,7 @@ can_run_nonroot() # the policy module if not already present, then check whether the # policy has been disabled via tunable or sysctl. [ -n "$(sysctl -qn security.mac.version)" ] || return 1 - sysctl -qn security.mac.ntpd >/dev/null || kldload -qn mac_ntpd || return 1 + load_kld mac_ntpd || return 1 [ "$(sysctl -qn security.mac.ntpd.enabled)" == "1" ] || return 1 # On older existing systems, the ntp dir may by owned by root, change diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 4e19d10f5e4e..451521c038d8 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -2413,37 +2413,38 @@ mount_md() # Code common to scripts that need to load a kernel module # if it isn't in the kernel yet. Syntax: -# load_kld [-e regex] [-m module] file +# load_kld [-e regex | -m module] file # where -e or -m chooses the way to check if the module # is already loaded: -# regex is egrep'd in the output from `kldstat -v', -# module is passed to `kldstat -m'. -# The default way is as though `-m file' were specified. +# -e greps the output from `kldstat -v', +# -m uses `kldstat -m module'. +# The default way is as though `-m file` was specified. load_kld() { - local _loaded _mod _opt _re + local _loaded _mod _opt _re _x + _x=0 while getopts "e:m:" _opt; do case "$_opt" in e) _re="$OPTARG" ;; m) _mod="$OPTARG" ;; - *) err 3 'USAGE: load_kld [-e regex] [-m module] file' ;; + *) _x=999 ;; esac + _x=$((_x + 1)) done shift $(($OPTIND - 1)) - if [ $# -ne 1 ]; then - err 3 'USAGE: load_kld [-e regex] [-m module] file' + if [ $# -ne 1 ] || [ $_x -gt 1 ]; then + err 3 'USAGE: load_kld [-e regex | -m module] file' fi - _mod=${_mod:-$1} _loaded=false if [ -n "$_re" ]; then if kldstat -v | egrep -q -e "$_re"; then _loaded=true fi - else - if kldstat -q -m "$_mod"; then - _loaded=true - fi + elif kldstat -q -m "${_mod:-$1}"; then + _loaded=true + elif kldstat -q -n "$1"; then + _loaded=true fi if ! $_loaded; then if ! kldload "$1"; then