From nobody Sun Jun 28 09:43:51 2026 X-Original-To: dev-commits-src-branches@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 4gp4HC5snNz6jvwG for ; Sun, 28 Jun 2026 09:43:51 +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 4gp4HC5Gs0z3dcP for ; Sun, 28 Jun 2026 09:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782639831; 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=PtC8O4RAPo+i0DyxYkvGnKj7H4om5ew8F8IvGSbFEFQ=; b=USqal0KWnYLqdVgNpDEiPznRnnsTgrVQUqQWNLrKDUqOoEF70po9Sm04aOkBb6PR+I2t5n AyP02KKwrx1Dvqtk4Yotk4cLOGfxQPEJuubwsYWfg4xuW/MbX00DRr8wiYuar+gxtRXfYi HeHsqW8WW0pVRx2Enkbh66gG2S1m7sMF3SoTWfh1rKVTHmseewh+OvRFiSD4Frj6F0aXDE GZv9QxUQSVTrvzewV4NstkXSE+XQMob55oHUTFgMNNehNLeZ+4XG48ejZxTAXVkSGE3M1N 0o1lLBVkdDGR6YcafRPe9XllCIsLRXUbAeIdvplPOopS7dopXOcwJ+xleNXPfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782639831; a=rsa-sha256; cv=none; b=PoHVvffUl9+64VSO++2OkwNPuKXRxjnCRY2KAqpMBnpDgBJfMIcygc0LDQlZdhq9QvzTPZ +CXYmZc8+ZoDqS9Xo5U8zl0Y1PsaK/Y00vMLDuLKFVyFPYHn6CWkRePgYDCB2RCWqF47XJ iUHaje8OgL+RhK1+AulFX/dkNb2niplbowWUjeQXFdlbwvB2hxA4jgAFI6XJ8ng1cbIfDS GbocS87cznFQHeu/LWFJinlHHYBa6ULiXIUvtIJkxzxtouB970bjBZLqWwI7XIMhZ3dvsv JARC4KWJHbayizjCSV058LV5H5npFrsjpDiYQZpjWLG2DAHuyxo/bG6K9H/QmA== 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=1782639831; 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=PtC8O4RAPo+i0DyxYkvGnKj7H4om5ew8F8IvGSbFEFQ=; b=OKcZVS4qbKTxEptEQNo8zObp3+k+mxZrCOOc6Wzg++rrs5YIcF8/+9Ya4zb9GjhB846V0O OwHwPdHBa7AycgCjkVrCmVnLAWXjE6PlxMgqZTwhYnkno7+T3J78SQHtwr1zTRujsrP/IF i2/l+3pXD7UFd7/DYfsjQZrsxl8hRINaHo5aIVN7QVXL+UEZ5itYJlFKPHV5DeGgMPlbso eW2GHTPh/MVnURa1XC+8p6frrNktcv6UtUfh/dUV9SyEW0679p69Q1gDiZkDMrxjkwRvTX 2BoWZJemAIwc+PTWWCGDq59jTeMB7qXNCHPdtUXocDjlo0Mfltqvc8CHI3ECqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gp4HC45rzz14hg for ; Sun, 28 Jun 2026 09:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31964 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 09:43:51 +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: 8f59fdb65239 - stable/15 - rc: Fix improper use of load_kld List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 8f59fdb652395e148905073ea214e335160977d8 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 09:43:51 +0000 Message-Id: <6a40ecd7.31964.1751f990@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=8f59fdb652395e148905073ea214e335160977d8 commit 8f59fdb652395e148905073ea214e335160977d8 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-23 15:23:25 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-28 09:43:39 +0000 rc: Fix improper use of load_kld Fix scripts that needlessly used -e when the simpler -m would work, or that used -m when the module and file name are the same, or, in one particularly egregious case, used -m with the wrong name when using nothing at all would have worked just fine. MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D57705 (cherry picked from commit cfe1962a19259fea8f51673f4da6c96656776486) --- libexec/rc/rc.d/bthidd | 6 +++--- libexec/rc/rc.d/cfumass | 2 +- libexec/rc/rc.d/linux | 8 ++++---- libexec/rc/rc.d/mountcritremote | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libexec/rc/rc.d/bthidd b/libexec/rc/rc.d/bthidd index 4b230406c4d5..275106a53d1e 100755 --- a/libexec/rc/rc.d/bthidd +++ b/libexec/rc/rc.d/bthidd @@ -35,9 +35,9 @@ bthidd_prestart() if evdev_enabled; then load_kld -m uinput uinput fi - load_kld -m kbdmux kbdmux - load_kld -m vkbd vkbd - load_kld -m ng_btsocket ng_btsocket + load_kld kbdmux kbdmux + load_kld vkbd vkbd + load_kld ng_btsocket return 0 } diff --git a/libexec/rc/rc.d/cfumass b/libexec/rc/rc.d/cfumass index 7d1117d7c388..b3ddd2ceedc8 100755 --- a/libexec/rc/rc.d/cfumass +++ b/libexec/rc/rc.d/cfumass @@ -74,7 +74,7 @@ cfumass_start() return "${err}" fi - load_kld -e cfumass cfumass + load_kld -m ctlcfumass cfumass # If the template is already switched to Mass Storage, then reset # it to -1 to force the host to reenumerate it; otherwise it might diff --git a/libexec/rc/rc.d/linux b/libexec/rc/rc.d/linux index d419920acaca..52a465a85b94 100755 --- a/libexec/rc/rc.d/linux +++ b/libexec/rc/rc.d/linux @@ -31,14 +31,14 @@ linux_start() case `sysctl -n hw.machine_arch` in aarch64) - load_kld -e 'linux64elf' linux64 + load_kld -m linux64elf linux64 ;; amd64) - load_kld -e 'linuxelf' linux - load_kld -e 'linux64elf' linux64 + load_kld -m linuxelf linux + load_kld -m linux64elf linux64 ;; i386) - load_kld -e 'linuxelf' linux + load_kld -m linuxelf linux ;; esac diff --git a/libexec/rc/rc.d/mountcritremote b/libexec/rc/rc.d/mountcritremote index 99becaefb10f..df8ab01b1dd0 100755 --- a/libexec/rc/rc.d/mountcritremote +++ b/libexec/rc/rc.d/mountcritremote @@ -26,7 +26,7 @@ mountcritremote_precmd() case "`mount -d -a -t nfs 2> /dev/null`" in *mount_nfs*) # Handle absent nfs client support - load_kld -m nfs nfscl || return 1 + load_kld nfscl || return 1 ;; esac return 0