From owner-svn-src-all@freebsd.org Wed Feb 21 02:35:14 2018 Return-Path: Delivered-To: svn-src-all@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 9A517F21FE8; Wed, 21 Feb 2018 02:35:14 +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 49B137F34F; Wed, 21 Feb 2018 02:35:14 +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 44619126C9; Wed, 21 Feb 2018 02:35:14 +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 w1L2ZEJt039760; Wed, 21 Feb 2018 02:35:14 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1L2ZEfG039759; Wed, 21 Feb 2018 02:35:14 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201802210235.w1L2ZEfG039759@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 21 Feb 2018 02:35:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329692 - head/stand/lua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/stand/lua X-SVN-Commit-Revision: 329692 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.25 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, 21 Feb 2018 02:35:14 -0000 Author: kevans Date: Wed Feb 21 02:35:13 2018 New Revision: 329692 URL: https://svnweb.freebsd.org/changeset/base/329692 Log: lualoader: Bring in local.lua module if it exists Provide a way for out-of-tree users of lualoader to patch into the loader system without having to modify our distributed scripts. Do note that we can't really offer any API compatibility guarantees at this time due to the evolving nature of lualoader right now. This still has some utility as local modules may add commands at the loader prompt without relying heavily on lualoader features- this specific functionality is less likely to change without more careful consideration. Reviewed by: cem (earlier version) Differential Revision: https://reviews.freebsd.org/D14439 Modified: head/stand/lua/loader.lua Modified: head/stand/lua/loader.lua ============================================================================== --- head/stand/lua/loader.lua Wed Feb 21 02:21:22 2018 (r329691) +++ head/stand/lua/loader.lua Wed Feb 21 02:35:13 2018 (r329692) @@ -30,6 +30,13 @@ local config = require("config") local menu = require("menu") local password = require("password") +local local_module + +local result, errstr, errnoval = lfs.attributes("/boot/lua/local.lua") +-- Effectively discard any errors; we'll just act if it succeeds. +if result ~= nil then + local_module = require("local") +end -- Declares a global function cli_execute that attempts to dispatch the -- arguments passed as a lua function. This gives lua a chance to intercept