Author: kevans
Date: Thu May  2 17:01:13 2019
New Revision: 347023
URL: https://svnweb.freebsd.org/changeset/base/347023

Log:
  stand: correct mis-merge from r346879
  
  Small mis-merge from multiple WIP resulted in block io media handles getting
  double-initialized. This resulted in some installations oddly landing at the
  mountroot prompt.
  
  Reported by:  ler
  Reviewed by:  imp

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

Modified: head/stand/efi/loader/main.c
==============================================================================
--- head/stand/efi/loader/main.c        Thu May  2 16:57:39 2019        
(r347022)
+++ head/stand/efi/loader/main.c        Thu May  2 17:01:13 2019        
(r347023)
@@ -910,20 +910,6 @@ main(int argc, CHAR16 *argv[])
        uhowto = parse_uefi_con_out();
 
        /*
-        * Scan the BLOCK IO MEDIA handles then
-        * march through the device switch probing for things.
-        */
-       i = efipart_inithandles();
-       if (i != 0 && i != ENOENT) {
-               printf("efipart_inithandles failed with ERRNO %d, expect "
-                   "failures\n", i);
-       }
-
-       for (i = 0; devsw[i] != NULL; i++)
-               if (devsw[i]->dv_init != NULL)
-                       (devsw[i]->dv_init)();
-
-       /*
         * Read additional environment variables from the boot device's
         * "LoaderEnv" file. Any boot loader environment variable may be set
         * there, which are subtly different than loader.conf variables. Only
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to