From owner-svn-src-all@freebsd.org Wed Mar 25 16:31:16 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8760F2A5A09; Wed, 25 Mar 2020 16:31:16 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48nYXL3hDnz4XK4; Wed, 25 Mar 2020 16:31:14 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 615D51DD86; Wed, 25 Mar 2020 16:24:29 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02PGOTAm002679; Wed, 25 Mar 2020 16:24:29 GMT (envelope-from freqlabs@FreeBSD.org) Received: (from freqlabs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02PGOTTk002678; Wed, 25 Mar 2020 16:24:29 GMT (envelope-from freqlabs@FreeBSD.org) Message-Id: <202003251624.02PGOTTk002678@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: freqlabs set sender to freqlabs@FreeBSD.org using -f From: Ryan Moeller Date: Wed, 25 Mar 2020 16:24:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359304 - stable/12/stand/lua X-SVN-Group: stable-12 X-SVN-Commit-Author: freqlabs X-SVN-Commit-Paths: stable/12/stand/lua X-SVN-Commit-Revision: 359304 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Mar 2020 16:31:17 -0000 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