From nobody Wed Apr 1 23:01:41 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 4fmL8V5gNXz6YhjX for ; Wed, 01 Apr 2026 23:01:46 +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 4fmL8V4bV8z425T for ; Wed, 01 Apr 2026 23:01:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775084506; 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=KYOgrUYhLLJlHUgJKL+j7oln3yMZZqzwosRkVOcCFiYN3/NmNndFitEWAokM2/u9vw6AQs xlVezkOfNRPn8O8NebAxx2Omq+vsdZ7zKDgStKu810YJlUb8bm8XxW8EqJ8y3zWJZ1HDBS t3NQAvvh9MrPP9k4nkBERVBBaPA7X/mDHTWr4uhLQJrpLUuW2dlxgDj71nPvgmT2gamCmN pJhqiDHXun52cLJEohEutD+3Ijt5C4YLV4TckZowqcW+6zWhuR6DYMCe5Am5/bx88Ii9p1 8Jmpf+ey3qU/JAawiz8AfXGJNxRaXwOd3uQYYc29x94ez9JXYJurkOxGwbH2Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775084506; a=rsa-sha256; cv=none; b=a8Ztge8oIHb9ZixIy0WLGnv02eo6PkUEpNu8FFSF/gdpEohn+DmNfkfaWIcBDVfYPW6+Cj nSM1T3aw1E0NOJHyzDttzennPASoLyOoGsK84tDk5OnslYSC053VZSlIzL05RuqV8ARCEC ikWYFLxHdtGK6X4vzTIA2PCcGTGNvd/w1q5zFF8sl6Lsr9ZWPtk+MaZUxZaUmDp5JoIqpg E2xQL3IRxul2UqYJVTAIEC8uWnkszH1aR7OvNBVsRbBbHJgQzSoPfzgRCDZ7nNQzYDSwaD 6A/a5EqfZKPwHk5ZNIPOuJTsf1p1ymvJ0z3gI2O/qfSLT/GQ/bAi0Z1Ew2aIEw== 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=1775084506; 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=A0c/IO2dM2qoOu0IvqIAJC5xujm+dI6ra6dY3oq9cv2Cj7yRklvW1IiOrCDaoAZx2k2L3l Ru57Pz7Rj9Uo0aOnhjXR6DD/cS18WwJXrTqqgveKJcSkxM0SwPn3flJ9dPlp55unVOdjio H7Th1no6h5xnNAEEW2YsiCPpx8qaqrnPNv42kZD00pXGK+phfZ26VNjv3b3OH0gM7LkyWa wiGAz9wzA6oau7FdmG8AUw+3HaOdH3PlIGMnaJj2VTsuU2j60+buaMT2WrFIIZ9TIbYFSa TaQcyab59vPbAlSP8anKSsIoNhAbnbWcEduTAwEwdMUcwZaTJJ0jJJNS+oF12g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fmL8V48dczc6C for ; Wed, 01 Apr 2026 23:01:46 +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: 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/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,