From nobody Sun Jun 28 09:43:55 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 4gp4HJ1gM5z6jvwL for ; Sun, 28 Jun 2026 09:43:56 +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 4gp4HH1g2cz3d4b for ; Sun, 28 Jun 2026 09:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782639835; 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=wWrULjPs9tKjO6z6Y+FvmwsPWQEEn3UmvxAnFVjgKVI=; b=D1QetdSSme71w9n4l66rsjPizkKZYZi6hKhlJxWzKEe1ct6AW5zoXSmV9ybjf/IxWxazLw mP/F1Ea55nR/5D95jjo9sgZqGUQo97rGDN748HIjgCuaFUSUV9Yz4MVPjjvek+lWdrPKXW TOL8l1TRzVnqzBEpSlHZnWPEhh+10moKYr8DV2zXnPn0NdTgmFDiZrx7PqfdEbeWK7gJpm EymDAv0ia9pfJ2z/tdCEDhdFp8YVxV1GF8lt45MVyyYTIxtHMpAD2JtOVM8GnHmprWKBXm Rc6NfZjriJbHvu3PERGVJGPf38YTGF1hrkA1r0E1dUktH8zvdkZ3kzNOoMFR+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782639835; a=rsa-sha256; cv=none; b=gx+2wPTqVme6TLZqi5UFx2tMvMn8jPpWDiBAS6Ktd64FfSMU1qdnk+N3XjKnQP7CQh0JPk LMGmbObOOuGxRNqlYSqlxVRzWrwb/FGWCKKViBuEPzALgGxLY+DB/qNgt6c0USzehmASLd f3s5/AA2kffZ8vtXeTAiVKzPcLauXj/u0QhzhgNcO+GS2GbS3sJV9qEi5BdfWOhtfugQTV dyFPDvRFFsaC+dDp+wBP8s4ZvXxfFL+2MJl6cr/529XT9VQnhVonQ6f9gi40A8iomRkFVT V0IMX3byeyWlxWhVpsTAN/bsaOVlNC0yqo5AqWBa0/yF+BPJbw7sEDJoTliKqg== 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=1782639835; 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=wWrULjPs9tKjO6z6Y+FvmwsPWQEEn3UmvxAnFVjgKVI=; b=QbwH5We4OiL1AhGugO7P4nibE4Nt8MSM30jf5/pJouB5Vu78AcNuxzxJQb4D+P5f/N4bsk h/8edv5SJtDRo3VNX92OQ5kELKBej1T3dDc1Iuu71lkHN8Dkf0LfreYjAgbpKnL5j1fJn/ m6wiKS9VMu0IknuL7kuQnwM0Fqu8TS+cI0Jd06+l8Jtbkrly3+h4jC4ubUnhodZmAoBt8O tlua7abU+YmGNZobaNkrKsJ6zB3ADPrggYgCJrGl3frZRvLGFJWnpb4OqnHvbhHBxM16Qy cFecYvOnPLDXYpmV6KXhsqIdiBs+gNBy83qnZon434E3OYS3jbKk2X/JCJO/bQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gp4HH0hYTz14TL for ; Sun, 28 Jun 2026 09:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27de6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 09:43:55 +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: 19cba6662468 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 19cba66624689b5ed628a641cf5da4b2b76203c9 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 09:43:55 +0000 Message-Id: <6a40ecdb.27de6.12e22794@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=19cba66624689b5ed628a641cf5da4b2b76203c9 commit 19cba66624689b5ed628a641cf5da4b2b76203c9 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-23 15:23:25 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-28 09:43:43 +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 ec7da8181ca3..624b2b1be00f 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 79c9b0ae63d4..3ca40883725e 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 1c6a97f606fe..3669bfeb1e55 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 b2e0f9cfec49..298d6cfbf074 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