From nobody Fri Jun 26 14:59:19 2026 X-Original-To: dev-commits-src-main@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 4gmzN76lZQz6jcs0 for ; Fri, 26 Jun 2026 14:59:19 +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 4gmzN758Jmz3d8Y for ; Fri, 26 Jun 2026 14:59:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782485959; 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=XfLy+DGRvVAA1vgm66IxLcgCb5/JvnW00KHCPSfy9pE=; b=bRoAxVcL2oO98/4RY0VFfTB/hUhte9LCBnr9EAjtpO1Ox8bUi3Mz0Wpf424nPbwm31cjuZ 8Pye4Q7MNslv7vr1zH1uoipb5EAlcwYD1zJrX83xqyDmnusoxSAwACrTRfIN7KdHHdrP/n p9bQxdYF5obL+3UeHKIEht9Ohv3p4qK8VC1mz5P24jOSP/zsFUsP/YTOYA+9sQFrt5nGfM CuqwLGzVkDarvm3fAbxO04XSH8qXSepznstNlfNZzGPN5qhR2xe+1vO+IpKzA5eQm7ySAu /AF3zGZ72A2xSycptu8u5mflmIJCUVFvI6FkW0Xnngi7FEtdGW1ZSC89Ii9edw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782485959; a=rsa-sha256; cv=none; b=mUy/l2URF5+uxxZ16Kr4pT+j3BlYLB0O5pkOZbzMI1GmRwP01H4JwjU1gg/6xE+CulUCYv 9Rm03GWQP2NxOREtSbQHDqehfl+eGsKgFqQ4VBt2EwvCHHlhDhXIyZ1F19W2AxzgwUXTkA B4k0C3A+WlMwtxVvTjsmutE6OL7pRE+EO3W7gFkydJOvSLfcpB15zpqpVDiGeBt8auyDih +vrlbRYZk9Df+UpjTXPeqwNYtpYlt5x/emA6dBdSa7htBlP/bAMXGhyX/JkySlBEvcapRW bVmT9W9elC2mSPRCJXOtvXStAfSMoWyBH7CRBba1+VRfrC7/NgCFEfzYfHOy/Q== 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=1782485959; 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=XfLy+DGRvVAA1vgm66IxLcgCb5/JvnW00KHCPSfy9pE=; b=QZqfj6a8/eOSSSlOGWL8RKgd9/0d8dmT4VQSrOY4HcCLIka1lX/thCJCfRUReWOKCPYEgj gvBj3FT3oyeMz6UIfvWfhaLRYBQ2MxDR1/x4ezlslh9uTbWE1DBIutKaqOFQLY7o3eVDId Zjb5ztnLZBNA5IYHpVXXeOrWNQWUA9Bug1sYWMdeudC9rcbTXznv376udSs0aaGwEU6Bup 2XW24y95Z5/SKi5cFawBV3ZN3jRdxQjW8zUoj7PMNrHeMaBJKW4q5DSiBwrqMgPTTWlS4C 8eSyNRUlGsKGGTooWlFsa+agi/309a0NyrCWN7defsborjsAcIivjKFm9ykFfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmzN73Wb7zj7L for ; Fri, 26 Jun 2026 14:59:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f268 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 14:59:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 82eb1970759d - main - loader.efi: Expand uefi_rootdev to probe disks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 82eb1970759de3fb7eacbbfc1e53bf64bf48dfe4 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 14:59:19 +0000 Message-Id: <6a3e93c7.1f268.272c93bb@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=82eb1970759de3fb7eacbbfc1e53bf64bf48dfe4 commit 82eb1970759de3fb7eacbbfc1e53bf64bf48dfe4 Author: Warner Losh AuthorDate: 2026-06-26 14:45:55 +0000 Commit: Warner Losh CommitDate: 2026-06-26 14:54:36 +0000 loader.efi: Expand uefi_rootdev to probe disks uefi_rootdev had to be the exact device to work. This is often difficult to arrange and awkward. Instead, have it search the specified device: As a partition if it specifies the partition, and as the whole disk if the specified partition didn't work or it specifies a disk. This brings it into lone what we do with other devices. This overrides the boot manager search we do before we do this for the boot device, but this knob has always been meant to overload the boot manager search. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D57803 --- stand/efi/loader/main.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 961ccc8f7065..78b397ca6870 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -629,10 +629,20 @@ find_currdev(bool do_bootmgr, char *boot_info, size_t boot_info_sz) efi_devpath_free(devpath); if (dp == NULL) break; - printf(" Setting currdev to UEFI path %s\n", - rootdev); - set_currdev_pdinfo(dp); - return (0); + printf(" Trying uefi_rootdev %s\n", rootdev); + /* if just a partition, just try that */ + h = NULL; + if (dp->pd_parent != NULL) { + if (try_as_currdev(dp, false)) + return (0); + /* That failed? Try the whole disk, but skip this part */ + h = dp->pd_handle; + dp = dp->pd_parent; + } + /* otherwise, it's a full disk, so try all its partitions */ + if (try_disk_and_partitions(dp, h) == 0) + return (0); + break; } while (0); /*