From nobody Wed Apr 1 23:01:04 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 4fmL7n5TrKz6YhZS for ; Wed, 01 Apr 2026 23:01:09 +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 4fmL7n1k6jz41Nd for ; Wed, 01 Apr 2026 23:01:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775084469; 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=+OMn+sm1BWzyU0mKQhOlKEyR8go8UlfV6H5Vmaj6w8k=; b=xm/rzAKqWlBdal349yEahTRMJdKjGePnk/smCh+SP6oEdhgXA5pRb5+wz4ng5q1hBKdM7B BmHyj+s7tAjjoB4QCr1lbsYV9IKC2SwxABydEmvujB2BApCZdL0CGzUsOw2qEUl9xmDU+T rMCsUYg6mcGWqIe9ugARir424ta1GRzKbOSamWfI99u7Jta4Vff1nkXMFBY53Qrba9Ilss kFZtCrAAmt5r+7QiSxa7BKfR0Louy3zXJqpt9zxWKqAdJdi3KNW8e+Mt9LJpRiElv+pz/b SOhHm3EdE4cqsxqsjWQuRRzS67Dd1OPGDtp+vbTVMKUcM42RNFKCfwsTN3gcyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775084469; a=rsa-sha256; cv=none; b=o6UyvLqhwqE13H459eTZwTN7JWb4V3r+rWZaop2GOMTcf9RlllSRBOHpukqeqi1u/nig0J OYmrxGp3e9TN3KpVtbY4/bb2sRb1+CDz9xSSKdXYOoA4nhpJ8ZQk8iKuIEbJwgYISP746c NdIesqVDvnIyo9jrvwJdi7BCdR1Gql9lep7WRlOjZseZlOR/ZtHkcGvaKZVbXzqBQOxZWX j1XJelmhS5AGRmgFQ2Js9otSN4jx6bXOtZZBb3QoIwMT4b3IK/X12VsD6fwzLjp/jK+YNu DXcmdx2IZxtMh6kn5bA1N/xpwwi0pkvy80Dpmfww+gE6i0cCKB7oMhRBhzjDEw== 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=1775084469; 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=+OMn+sm1BWzyU0mKQhOlKEyR8go8UlfV6H5Vmaj6w8k=; b=MJeIQ/bl9CJyNN4cZRLTLa7LW186k3FQpUe0IQtcRtLsbIpHR/uFUnqz7TdW+Jccg/2WIK SacRXYMHRgm7M4jKqfSuB8Ufz3HbiCJ9kW5kIB4on2A2BNLBRQGXDJ31xMditPFsTYbhkK oyUjod4sSXwM/inbNZ01zVr1YM1mlrizj4aSQqSLIiVsUF+qoIy893ADw4W6jfr/+l8uj4 ikDQkAdA/EYEUsXyNN35JA1JmOl/juqf/gaygk0XsckyancIhKd6IFeG3MdU0VRHWBzn86 1QVVIHDsMyO4iKa1DUUJnMauGMWxX0exduNhJSnXEye+3MDbWjg2qtRUt3YcaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fmL7n1H59zcR7 for ; Wed, 01 Apr 2026 23:01:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 468cb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 01 Apr 2026 23:01:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 4fed52fd6410 - stable/15 - loader(8): embedded MD should be the most preferred currdev 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 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/15 X-Git-Reftype: branch X-Git-Commit: 4fed52fd6410ed46b1ea119533dc705a06cd8971 Auto-Submitted: auto-generated Date: Wed, 01 Apr 2026 23:01:04 +0000 Message-Id: <69cda3b0.468cb.4242c90b@gitrepo.freebsd.org> The branch stable/15 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=4fed52fd6410ed46b1ea119533dc705a06cd8971 commit 4fed52fd6410ed46b1ea119533dc705a06cd8971 Author: Navdeep Parhar AuthorDate: 2026-03-20 00:39:17 +0000 Commit: Navdeep Parhar CommitDate: 2026-04-01 19:03:50 +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 d1671d9e5c82..65a45d241fe4 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -570,6 +570,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 @@ -585,15 +594,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,