D55979.diff
No OneTemporary
Actions

Size

830 B

Referenced Files

None

Subscribers

None

D55979.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
	@@ -597,6 +597,15 @@
	} /* 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
	zfsinfo_list_t *zfsinfo = efizfs_get_zfsinfo_list();
	zfsinfo_t *zi;
	@@ -616,15 +625,6 @@
	}
	#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,