From nobody Wed Apr 1 23:01:41 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 4fmL8P3wjmz6YhZZ for ; Wed, 01 Apr 2026 23:01:41 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fmL8P3RVKz41jy for ; Wed, 01 Apr 2026 23:01:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775084501; 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=vjJpdRiNL695rTPNW29NGswz0vtIWFk0ZUmW/0DmPAI=; b=YrrRLY1XjKoTHEIB+hUauO5gQVhM3ObSLxGz0B0G3egeDpPUTfpIfTEbwZUHCfOrngkIvg J52wrZ6TiH+TfwSOJ+swU1ELLEoHb0e140gqJx79nR9ZkSyhNLk6MdoJFif1EsDwqDtkRw G7mvemt31B8M2rPXMAAkGXwNaJWqu5vyH/2uOVwe3pMtvVtnVu1ycS22pxsg7xhfDiRAMG Gpjw4Veywo5ou+5K7kOuNPS7sSgFT2v2NdybCli9T/q2lg/5vnKQRHNFMqnCifXBKPA2J9 rAHPjtcqVWMACS7BKViuS5pspYQ9B7oMwVes1x3BTaLtD02Zu0NgVYKLFb3Uog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775084501; a=rsa-sha256; cv=none; b=BnPlrvZIWKBiTGj2RqLm1LM2v8LfHkCdpNFbWEBn877Jy13ecO6RgDVQosfGKkFgcJBD4h B0S/p7BVFabFvIs2uMZOWi7ulbuCIoW1aAL/JpfJDTMcifn3KrgM3EG/Z/A/sqJ/V9i2On eeIxU2AeOdgSdO+wZ4DjhFGdTlgfsjVi/pfe253NxVMq/BrgVkyMO7M37j5F0nmBaEhxWy UhgQ0UKCA/DWF7dRCMaqhJK6sjcyFydZQJnkKBPLEUiVzTKw6rEk2JsWPaJQwQlG5oHp/Z G5PAcjIlkUUANevnLCX/Kze3z2ivL8ii7/B4aTckb/ZLE6lB7nVQsrKHev+Xug== 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=1775084501; 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=vjJpdRiNL695rTPNW29NGswz0vtIWFk0ZUmW/0DmPAI=; b=xYPWWefien5uHgaCagMmGVa7CA0pIxFHB/41fE8Whhh98WAx4ibie9Pi9RA+xdQKEhTb6H CQ6AB63z0YouvRwNN/djOJEwlKccPHxjXn64exDqB68f4GbCnD4mwbMP8nTbbwUkJWZEWG 4r7zZrPZvBRd0VFhyzfOWRr+5cxeC7tq7O5Hlyl5ZWfU0lVxkyP95xjJRHV4WZqClbI9fE Q0Z2DwsdQ5wDieOjXWh3XxFmNjMKgiVJamI/hOXC8ooiRSB4GJBYI8XjTxvKtXjigngO5u kZClyFciarL4BSJbmlAjfifuaUgPtrXXj6TzdnhYgssvRsKt5iOBqK/Wy95OMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fmL8P2tk3zcL2 for ; Wed, 01 Apr 2026 23:01:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47f21 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 01 Apr 2026 23:01:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: a4a3825d3e1d - stable/14 - loader(8): embedded MD should be the most preferred currdev 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a4a3825d3e1dff1fea1d81443e0d92af6671a0c3 Auto-Submitted: auto-generated Date: Wed, 01 Apr 2026 23:01:41 +0000 Message-Id: <69cda3d5.47f21.60ce5976@gitrepo.freebsd.org> The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=a4a3825d3e1dff1fea1d81443e0d92af6671a0c3 commit a4a3825d3e1dff1fea1d81443e0d92af6671a0c3 Author: Navdeep Parhar AuthorDate: 2026-03-20 00:39:17 +0000 Commit: Navdeep Parhar CommitDate: 2026-04-01 19:04:38 +0000 loader(8): embedded MD should be the most preferred currdev A loader built with MD_IMAGE_SIZE is almost always meant for use with its embedded image and should try that as currdev before anything else. Recent changes (d69fc3a9dc71, 784150fd2535) seem to have relaxed the ZFS code's search for a rootfs and exposed this problem. Reviewed by: imp, tsoome Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D55979 (cherry picked from commit 0661997cea165e951e4e215e6aed41596d8b1d52) --- stand/efi/loader/main.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 1df1547f23b8..d6a42c0241fc 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -555,6 +555,15 @@ find_currdev(bool do_bootmgr, bool is_last, } /* Nothing specified, try normal match */ } +#ifdef MD_IMAGE_SIZE + /* + * If there is an embedded MD, try to use that. + */ + printf("Trying MD\n"); + if (probe_md_currdev()) + return (0); +#endif /* MD_IMAGE_SIZE */ + #ifdef EFI_ZFS_BOOT /* * Did efi_zfs_probe() detect the boot pool? If so, use the zpool @@ -570,15 +579,6 @@ find_currdev(bool do_bootmgr, bool is_last, } #endif /* EFI_ZFS_BOOT */ -#ifdef MD_IMAGE_SIZE - /* - * If there is an embedded MD, try to use that. - */ - printf("Trying MD\n"); - if (probe_md_currdev()) - return (0); -#endif /* MD_IMAGE_SIZE */ - /* * Try to find the block device by its handle based on the * image we're booting. If we can't find a sane partition,