From owner-svn-src-head@freebsd.org Sat Mar 31 23:49:01 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 621ECF66FA9; Sat, 31 Mar 2018 23:49:01 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 090957CE6F; Sat, 31 Mar 2018 23:49:01 +0000 (UTC) (envelope-from kevans@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 F03271EB66; Sat, 31 Mar 2018 23:49:00 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2VNn0gi002907; Sat, 31 Mar 2018 23:49:00 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2VNn0EK002906; Sat, 31 Mar 2018 23:49:00 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803312349.w2VNn0EK002906@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Sat, 31 Mar 2018 23:49:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r331855 - head/stand/lua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/stand/lua X-SVN-Commit-Revision: 331855 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Mar 2018 23:49:01 -0000 Author: kevans Date: Sat Mar 31 23:49:00 2018 New Revision: 331855 URL: https://svnweb.freebsd.org/changeset/base/331855 Log: lualoader: Don't assume that {module}_load is set The previous iteration of this assumed that {module}_load was set. In the old world order of default loader.conf(5), this was probably a safe assumption given that we had almost every module explicitly not-loaded in it. In the new world order, this is no longer the case, so one could delete a _load line inadvertently while leaving a _name, _type, _flags, _before, _after, or _error. This would have caused a confusing Lua error and borked module loading. Modified: head/stand/lua/config.lua Modified: head/stand/lua/config.lua ============================================================================== --- head/stand/lua/config.lua Sat Mar 31 23:40:05 2018 (r331854) +++ head/stand/lua/config.lua Sat Mar 31 23:49:00 2018 (r331855) @@ -205,6 +205,9 @@ local function loadModule(mod, silent) local status = true local pstatus for k, v in pairs(mod) do + if v.load == nil then + goto continue + end if v.load:lower() == "yes" then local str = "load " if v.flags ~= nil then @@ -232,6 +235,7 @@ local function loadModule(mod, silent) end if v.error ~= nil then cli_execute_unparsed(v.error) + end status = false end @@ -249,6 +253,7 @@ local function loadModule(mod, silent) -- print("Skipping module '". . k .. "'") -- end end + ::continue:: end return status