Page MenuHomeFreeBSD
Files F174262612

D59419.diff
No OneTemporary
Actions

D59419.diff
View Options

diff --git a/stand/efi/loader/conf.c b/stand/efi/loader/conf.c
--- a/stand/efi/loader/conf.c
+++ b/stand/efi/loader/conf.c
@@ -32,10 +32,6 @@
extern struct devsw vdisk_dev;
-#ifdef MD_IMAGE_SIZE
-extern struct devsw md_dev;
-#endif
-
struct devsw *devsw[] = {
&efipart_fddev,
&efipart_cddev,
@@ -48,7 +44,7 @@
#ifdef EFI_ZFS_BOOT
&zfs_dev,
#endif
-#ifdef MD_IMAGE_SIZE
+#if defined(LOADER_MD_SUPPORT)
&md_dev,
#endif
NULL
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
@@ -324,12 +324,10 @@
}
#endif
-#ifdef MD_IMAGE_SIZE
-extern struct devsw md_dev;
-
static bool
probe_md_currdev(void)
{
+#ifdef LOADER_MD_SUPPORT
bool rv;
set_currdev_devsw(&md_dev, 0);
@@ -337,8 +335,10 @@
if (!rv)
printf("MD not present\n");
return (rv);
-}
+#else
+ return (false);
#endif
+}
/*
* Try the passed in partition or entire disk to see if we can find a bootable
@@ -646,7 +646,13 @@
} while (0);
/*
- * Third choice: If we can find out image boot_info, and there's
+ * Third choice: If there is an MD device, try to use that.
+ */
+ if (probe_md_currdev())
+ return (0);
+
+ /*
+ * Forth choice: If we can find out image boot_info, and there's
* a follow-on boot image in that boot_info, use that. In this
* case root will be the partition specified in that image and
* we'll load the kernel specified by the file path. Should there
@@ -664,15 +670,6 @@
} /* Nothing specified, try normal match */
}
-#ifdef MD_IMAGE_SIZE
- /*
- * Forth choice: If there is an embedded MD, try to use that.
- */
- printf("Trying configured MD\n");
- if (probe_md_currdev())
- return (0);
-#endif /* MD_IMAGE_SIZE */
-
/*
* Fifth choice: try all the partitions on the boot device.
*/

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 2, 8:15 PM (2 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40097911
Default Alt Text
D59419.diff (1 KB)

Event Timeline