Attachment #202095 for bug #235806

View | Details | Raw Unified | Return to bug 235806
Collapse All | Expand All

Lines 35-41 __FBSDID("$FreeBSD$"); Link Here

(-)b/stand/efi/loader/conf.c (+7 lines)
35	#include <libzfs.h>	35	#include <libzfs.h>
36	#endif	36	#endif
37		37
		38	#ifdef MD_IMAGE_SIZE
		39	extern struct devsw md_dev;
		40	#endif
		41
38	struct devsw *devsw[] = {	42	struct devsw *devsw[] = {
		43	#ifdef MD_IMAGE_SIZE
		44	&md_dev,
		45	#endif
39	&efipart_fddev,	46	&efipart_fddev,
40	&efipart_cddev,	47	&efipart_cddev,
41	&efipart_hddev,	48	&efipart_hddev,




}
#endif

#ifdef MD_IMAGE_SIZE
static bool
probe_md_currdev()
{
	/* defined in md.c */
	extern struct devsw md_dev;

	char *devname;
	struct devdesc currdev;
	currdev.d_dev = &md_dev;
	currdev.d_unit = 0;
	set_currdev_devdesc(&currdev);
	return (sanity_check_currdev());
}
#endif

static bool
try_as_currdev(pdinfo_t *hd, pdinfo_t *pp)
{

	}
#endif /* EFI_ZFS_BOOT */

#ifdef MD_IMAGE_SIZE
	if (probe_md_currdev())
		return (0);
#endif

	/*
	 * Try to find the block device by its handle based on the
	 * image we're booting. If we can't find a sane partition,

Return to bug 235806

Lines 257-262 probe_zfs_currdev(uint64_t guid) Link Here

(-)b/stand/efi/loader/main.c (+21 lines)
257	}	257	}
258	#endif	258	#endif
259		259
		260	#ifdef MD_IMAGE_SIZE
		261	static bool
		262	probe_md_currdev()
		263	{
		264	/* defined in md.c */
		265	extern struct devsw md_dev;
		266
		267	char *devname;
		268	struct devdesc currdev;
		269	currdev.d_dev = &md_dev;
		270	currdev.d_unit = 0;
		271	set_currdev_devdesc(&currdev);
		272	return (sanity_check_currdev());
		273	}
		274	#endif
		275
260	static bool	276	static bool
261	try_as_currdev(pdinfo_t hd, pdinfo_t pp)	277	try_as_currdev(pdinfo_t hd, pdinfo_t pp)
262	{	278	{
Lines 508-513 find_currdev(EFI_LOADED_IMAGE *img, bool do_bootmgr, bool is_last, Link Here
508	}	524	}
509	#endif /* EFI_ZFS_BOOT */	525	#endif /* EFI_ZFS_BOOT */
510		526
		527	#ifdef MD_IMAGE_SIZE
		528	if (probe_md_currdev())
		529	return (0);
		530	#endif
		531
511	/*	532	/*
512	* Try to find the block device by its handle based on the	533	* Try to find the block device by its handle based on the
513	* image we're booting. If we can't find a sane partition,	534	* image we're booting. If we can't find a sane partition,