From nobody Tue Jun 23 15:23:51 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 4gl83r1vTDz6hZt8 for ; Tue, 23 Jun 2026 15:23:52 +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 4gl83r0pK6z49B8 for ; Tue, 23 Jun 2026 15:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782228232; 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=APjTgtAPgAiW7oplYb3gl6OF5oEcI4ByXZOdcYW0ey4=; b=vKsIy6A0o++o2rGWJmrbwwQjbwcxczle0q8vWalHeMccbalb4wERCO8JdErkQhP/cmju3D rXy54KHwRP16thTQaTvTipa4wvBzyAjoACoYHDnKKjvZvqft7TDMDWUeVNHSL2dF/1/WDs HwXLSvkwd6P54G+LyXJjquHr+PXlySYGDuqS8k3ZhnS5QbMCiSFDMxa6WOV+jOoPDjZgqn SSJAC3GC6pbgFj2FHTnQ+9yo9tLbR7oyEYLPuWC0BVrngl7q+/hwUoEpYmhkQQLqp9mKVo PwOiMIK1aPsPRTR4Lta7GqfMqlQkaa3GUp51JyjlQAeMpaBCPrbepQ11PePQoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782228232; a=rsa-sha256; cv=none; b=aaMZ4Gp4tmKlefIJijAoaLxzb2Eo6OOu29j2s1+UsMW4hllKLgwxIVmJ0A5bTTFk02o78M 29wl5uU2lqCnnThOca1Tz1ctAbCkJnoiV2Dey8vXeIoVjLb/UJ/tfOs5K6ZjwM0iuhXf1i uVkP2Z708SAsGDH0ZQH8yfZ6KiSx2ziGt791w3Im2ltS8Z/8wrqedcBmVZMFtgfKxZx18J sbXK63E7fn/PtBnJ/dehBO9l1JB1Q4X35C6U+ax4FnK7K8baH5gwubNvq7v+k22Z195tPk jNJLqt3TJXkE2bll7MmVOxuokkkpi9wV6QdxNxEilgYRBfMhERmQDUu9oKxJ0g== 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=1782228232; 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=APjTgtAPgAiW7oplYb3gl6OF5oEcI4ByXZOdcYW0ey4=; b=ya6ERvcYv6U9g/ACH1KAL55jt7a+GAbWUaOjL6Z7IuvF6ouV3HgZxDwoHZSYjn/5o6zoH7 YbaDk1SWOr5YeA/0l+HKQyDiWIzeNyRxNuWaZ+oNw5LdFN5MBwN+EGlYOBzE2bRg8coAsA yeJpwE0bz1OA9cwZYhkz1v8UQufG8uIVKnSQsQPGHmvuOiEd0fB2IqoXwhr0zLIE7OaHUE Z3cMztEyMhBQqIgrc5Csw/rxCxoWHXJMMkf4zoF8lSWf4VJCA51P8CSogUfYluUPpkEbYp vEwha8VaLaDAo49CsbEbZmLVAqYYKnUI8vRIYFieE07OiAnEU/VNAON3z3XfSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl83q6QgdzgWB for ; Tue, 23 Jun 2026 15:23:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e46d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 15:23:51 +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: cfe1962a1925 - main - rc: Fix improper use of 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: cfe1962a19259fea8f51673f4da6c96656776486 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 15:23:51 +0000 Message-Id: <6a3aa507.1e46d.7dfe75a1@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=cfe1962a19259fea8f51673f4da6c96656776486 commit cfe1962a19259fea8f51673f4da6c96656776486 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-23 15:23:25 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-23 15:23:25 +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 --- 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