From nobody Tue Jun 23 15:23:53 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 4gl83s3f4Bz6hb5n for ; Tue, 23 Jun 2026 15:23: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 4gl83s1cGyz48lK for ; Tue, 23 Jun 2026 15:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782228233; 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=z78l4vx4BCXlQZubhBeVABwhdjUPzMArdQHwj2Ukjw0=; b=B/Cp8PNDvwMslt7qFbOgqEd7wZvCpk4OQE5BE53xkrxgD8hZg7qcEN9EyWp7eIIoWyj8GQ pt0jyLCOZXvuHwZR+h6gVDCc07ox5tvTSv9GwVApv2gilL1ePJ42lPfrdVtWIQEz9Owa17 xSLWnPyJx2wwB7OV5EsrULybQk6GI2lKM+cTk0RA/U0k0jzKtGL08LJccc69k28tDo8QL2 a24JXkMEuGwK2F7/IJQi0eYs06FkbqqwexeLKhKhPD14QbLfOtnb4/Bxu3t0uz9eKq2BaK P2sVos1C2n8Xvv9g5VHEGNgiOKPQrZDmc8K8Pm3SH9gcKRzaIj9Qhvxr5mmdyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782228233; a=rsa-sha256; cv=none; b=e/oOtyM4umjeNK20rp/uXUIKvrxzG4EnOqxVI7cB2mSxXEVb+5jsjPLWQDQyOi4b6Cz8hI 6SbjphiK2/RzrEcu014l+EyJEP/NZRTr7hrSsNPSoi4XDotYEOGxwDD1SUmkNgNLVwgE9b 0+FGGzFq5NyyJjxaWeBGuoAJXZLghhNkyTRRKodlrbcyxj4jPFUxQ0DlkSguQsa/GwCRLC 0Q1P4ki/Js9rV28jigJetW3z2Jm2fI/dJTyAA7h7Kram8Iu+r3xKsSGaeRwq1qZ2eckS8X ZHDYxoxNBeC+ItInc8BFptG+IGeRIPPMNhmcoTgMJnQ2S7/FTU6K+Si0QzPgQQ== 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=1782228233; 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=z78l4vx4BCXlQZubhBeVABwhdjUPzMArdQHwj2Ukjw0=; b=MWnWztzpaeUKjm0VVW97ikEuClynz322Xj8eBS8AqbndEgKL5kxg2/zN93k48Bld9Z/Rt+ UuVCLIC1SoSF9g3Sr/RizHWd5GgCzGJ7gQ6eQZSFYrs8HdqZZLBj3fPWDyCHK5zF+nVhHQ F0D6FD6WqJehwHz7wDnfbp9JhdQehb2QH7HE4ZnBGDOdg5HQKAA7VAFFL3tbMf2dPy9omJ /Jr0Ds38KFU/BF19XOzltl+j0aIIIC0kC2xN0LNSmnn1Uh1V/fRqOomDwBJnBrJp4yjOMl k0JzmawjREJqFHHAtjuXPNlq8tRHPzz86ykWb9u8AI8/FNqjzq8Od8qLufo+Xw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl83s08r0zgWC for ; Tue, 23 Jun 2026 15:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e363 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 15:23:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: a95d324dd310 - main - 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/main X-Git-Reftype: branch X-Git-Commit: a95d324dd3107afcbc16767d183acca7a57ebca9 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 15:23:53 +0000 Message-Id: <6a3aa509.1e363.501820a7@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a95d324dd3107afcbc16767d183acca7a57ebca9 commit a95d324dd3107afcbc16767d183acca7a57ebca9 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-23 15:23:30 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-23 15:23:30 +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 --- 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 d18ba2f08346..851db5dd6a32 100755 --- a/libexec/rc/rc.d/kld +++ b/libexec/rc/rc.d/kld @@ -44,10 +44,12 @@ kld_start() local _kld - startmsg "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 101c69e93cde..7cb652e5ec17 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -2423,37 +2423,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