D57803.id180736.diff
No OneTemporary
Actions

Size

779 B

Referenced Files

None

Subscribers

None

D57803.id180736.diff
View Options

	diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c
	--- a/stand/efi/loader/main.c
	+++ b/stand/efi/loader/main.c
	@@ -629,10 +629,20 @@
	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);

	/*