svn commit: r337131 - head/stand/efi/loader

Toomas Soome tsoome at FreeBSD.org
Thu Aug 2 12:43:41 UTC 2018


Author: tsoome
Date: Thu Aug  2 12:43:40 2018
New Revision: 337131
URL: https://svnweb.freebsd.org/changeset/base/337131

Log:
  loader.efi: efipart_inithandles() failure should not prevent devsw initialization
  
  The efipart_inithandles() can return error code when there are no block devices,
  however, we still should walk and initialize devsw.

Modified:
  head/stand/efi/loader/main.c

Modified: head/stand/efi/loader/main.c
==============================================================================
--- head/stand/efi/loader/main.c	Thu Aug  2 12:39:23 2018	(r337130)
+++ head/stand/efi/loader/main.c	Thu Aug  2 12:43:40 2018	(r337131)
@@ -861,12 +861,15 @@ main(int argc, CHAR16 *argv[])
 	 * Scan the BLOCK IO MEDIA handles then
 	 * march through the device switch probing for things.
 	 */
-	if ((i = efipart_inithandles()) == 0) {
-		for (i = 0; devsw[i] != NULL; i++)
-			if (devsw[i]->dv_init != NULL)
-				(devsw[i]->dv_init)();
-	} else
-		printf("efipart_inithandles failed %d, expect failures", i);
+	i = efipart_inithandles();
+	if (i != 0) {
+		printf("efipart_inithandles failed with ERRNO %d, expect "
+		    "failures", i);
+	}
+
+	for (i = 0; devsw[i] != NULL; i++)
+		if (devsw[i]->dv_init != NULL)
+			(devsw[i]->dv_init)();
 
 	printf("%s\n", bootprog_info);
 	printf("   Command line arguments:");


More information about the svn-src-head mailing list