Author: kevans
Date: Sat Mar 28 17:11:54 2020
New Revision: 359400
URL: https://svnweb.freebsd.org/changeset/base/359400

Log:
  MFC r359072-r359073: loader: Add a "kernel.loaded" hook
  
  This hook can be useful, for example to run a local function to choose
  different modules to load when a user has picked a different kernel
  from the menu.

Modified:
  stable/11/stand/lua/config.lua
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/stand/lua/config.lua
==============================================================================
--- stable/11/stand/lua/config.lua      Sat Mar 28 17:06:34 2020        
(r359399)
+++ stable/11/stand/lua/config.lua      Sat Mar 28 17:11:54 2020        
(r359400)
@@ -623,7 +623,7 @@ end
 function config.loadelf()
        local xen_kernel = loader.getenv('xen_kernel')
        local kernel = config.kernel_selected or config.kernel_loaded
-       local loaded, status
+       local status
 
        if xen_kernel ~= nil then
                print(MSG_XENKERNLOADING)
@@ -633,11 +633,10 @@ function config.loadelf()
                end
        end
        print(MSG_KERNLOADING)
-       loaded = config.loadKernel(kernel)
-
-       if not loaded then
+       if not config.loadKernel(kernel) then
                return false
        end
+       hook.runAll("kernel.loaded")
 
        print(MSG_MODLOADING)
        status = loadModule(modules, not config.verbose)
@@ -647,5 +646,6 @@ end
 
 hook.registerType("config.loaded")
 hook.registerType("config.reloaded")
+hook.registerType("kernel.loaded")
 hook.registerType("modules.loaded")
 return config
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to