svn commit: r313337 - head/sys/boot/efi/loader

[Toomas Soome]

Author: tsoome
Date: Mon Feb  6 10:57:54 2017
New Revision: 313337
URL: https://svnweb.freebsd.org/changeset/base/313337

Log:
  loader: 313329 missed ZFS guard in loader/main.c
  
  Missing guard added.
  
  Reviewed by:	imp, allanjude
  Approved by:	imp (mentor), allanjude (mentor)
  Differential Revision:	https://reviews.freebsd.org/D9458

Modified:
  head/sys/boot/efi/loader/main.c

Modified: head/sys/boot/efi/loader/main.c
==============================================================================
--- head/sys/boot/efi/loader/main.c	Mon Feb  6 10:51:53 2017	(r313336)
+++ head/sys/boot/efi/loader/main.c	Mon Feb  6 10:57:54 2017	(r313337)
@@ -185,6 +185,7 @@ find_currdev(EFI_LOADED_IMAGE *img)
 	int unit;
 	uint64_t extra;
 
+#ifdef EFI_ZFS_BOOT
 	/* Did efi_zfs_probe() detect the boot pool? */
 	if (pool_guid != 0) {
 		struct zfs_devdesc currdev;
@@ -203,6 +204,7 @@ find_currdev(EFI_LOADED_IMAGE *img)
 		    env_nounset);
 		return (0);
 	}
+#endif /* EFI_ZFS_BOOT */
 
 	/* We have device lists for hd, cd, fd, walk them all. */
 	pdi_list = efiblk_get_pdinfo_list(&efipart_hddev);