From nobody Wed Apr 1 23:01:04 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 4fmL7h2d4Kz6Yhg3 for ; Wed, 01 Apr 2026 23:01:04 +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 4fmL7h1FD2z41Xy for ; Wed, 01 Apr 2026 23:01:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775084464; 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=fyE4XDxIFBHnK7L5ajGISQU5RQaX2muOnEmn4dxnOFS38HE+HI4atOsdkydKQ07TEnd2sV 7qbD4+uz9+f2t+ia9zAJEYDMGdX9IWPTG/bF2EWB1sIqJSvJLowtZd2uxR4FH57SkWIR66 XQDfSur25yHAq/QpZTGthzHkzn5hpn5LZW2nzfAdMWhJ5GoZVOs3wsJh6dTw/y10tn+Nqm tGctW3CauayT1C2piH3zVcwC5LyIJihlXq/6gJMb9FiAOc+nicp2pmNFvqiWQmuGzJAYWZ dfT4HSsKOxJ4ohbwVGvNQ4aTyZaYtykYxc1WRv4m+81GGNI8gW4X9Oft5A1DOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775084464; a=rsa-sha256; cv=none; b=sjLhFyPQdlz154dVF2SOUEa3NDXNFqwbKPJvDTbuj+r0WEp+C1CaHHi7/TXNasnEwZ7b8j Sh7ljR1cW/GmJZ+C9rJMV2GjPEhyRJrtik9SKRo+yCDmJ3nWIrcXPEVD+7IWt2kjBYLtJF eGGz8RhqYGmBYYfe5cQhqoEzXoSidnY7odhKrtxdRIAP+LOTXCZ5MjHf6l+WpfQfxtPdR3 SGrExJyS6EzaR/GXB3LPCVikyhPGjzRgUvRrey+T72yo6nt46wVhWptbL3QCCAZfQdV9Qp EDn6GwZrupGDm0a/2wCbf4jCF3vxIpae3p7gXYCGIVWtbHuThyAwfwepZ6r8uw== 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=1775084464; 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=HC8wIlIJGjIZY6wKaapn8D+XdGQBXNNaaAnI9Oz0KXO/vuVdGTME2TcPvTf83GPoFUE8Qm YsdX1fCpwbqZtaxK07lOlIhQ5AUK5RaVuTFs8VhKADVUPVg9qbI+5R0p4Z3he5AIHFnW9V 25T5W0SOFEMw0VCz+bxC2QLNgbuc1A3pwmbi3hA7uUM83YmxSWH+hw7tqWjVC8mJKvQ4l7 //RS4A//qSmteCbGkvn5CuJ88FXA3HsFr7Oh1K3aVWlSI7gh12tfwXQRu1/9iWTA+jVb5C FAr7742gZ82zG/b0I1QWkiHyIDAQcpJeyCx6wJsZvqKsb6JwCvS4WYhk8bRZeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fmL7h0ryLzcR3 for ; Wed, 01 Apr 2026 23:01:04 +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: 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/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,