svn commit: r359304 - stable/12/stand/lua

[Ryan Moeller]

Author: freqlabs
Date: Wed Mar 25 16:24:28 2020
New Revision: 359304
URL: https://svnweb.freebsd.org/changeset/base/359304

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.
  
  Reviewed by:    kevans
  Approved by:    mav (mentor)
  Sponsored by:   iXsystems, Inc.
  Differential Revision:  https://reviews.freebsd.org/D24115

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

Modified: stable/12/stand/lua/config.lua
==============================================================================
--- stable/12/stand/lua/config.lua	Wed Mar 25 15:56:18 2020	(r359303)
+++ stable/12/stand/lua/config.lua	Wed Mar 25 16:24:28 2020	(r359304)
@@ -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