From nobody Thu Aug 01 14:50:29 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WZX2G0rTnz5Sswq; Thu, 01 Aug 2024 14:50:30 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WZX2F5GzJz4JTC; Thu, 1 Aug 2024 14:50:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722523829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o7e+CJju8BIAuNmiVifPNYZFyPkCqhPITrwOS1nqaKA=; b=CZQ+I22cm/d+6HMPRE5aNFUbq3gmQlxCQhYs/2ASJqW68RB1tZySsA9lecyXshk/3XBnLW sZgCZVZUIwFE0jsxzAikhMcyLSDbd/qIA8KwFqdlp9VPVedFGWD/CgPFHt1zV8RKrqWMO8 tRSxOduPp3mrZA7tbQABNBSBWN8HKRn0DTcnAYoQnOdK0c6oGhBxlnd8t7yJmEWYWeBuYR AoaRSwcvjlrPQB6i1DauoACXApb6GSQNJA+kvkEbJF+PptWLxHC4vPZ5HJNdtCW8dixgdE CsfIFq3WCM4ja78ZQEnd++g2B/XEDOaIw1wuSVhTMTpzXIVgRDBcw1wlifyoiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722523829; a=rsa-sha256; cv=none; b=kMLF5x82H3kiXTS6mkXeGudPofiKUUsWp4UZOKx7vqKJ9OhdtEi3SiZJkfXEElihz2vd0C gF/CLkhGjXWF2WayBMt+auOkMa9AONzHgAdxNe6qQQdMC/1hbpXNTIXcRW8/6G/AarM2xT /JStWNcymVPGh5p8IMcLVPx8QEIC/hZlhEKEHzy154nUqLck5g2sGWF5F4y6wEextKK5mF DjjWWgtfohCwFewyp/IEPo7/bxXK4DOLG9Gu0B3RDXMHY0X9aolWSeJ/YkcM5Av+M2ThlN Vug28uqPBGENrv9OQCzuS+XAmFJhd5HEkio1hYuhYZXCSZoZW4orGs9YO58Dtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722523829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o7e+CJju8BIAuNmiVifPNYZFyPkCqhPITrwOS1nqaKA=; b=vL73AXXlhjFzwscN/J87vN/9ZjgGyBGXlQ+t2zvTL7j+OCSi+BYnhWox1X8MM1Z7jWHHON sENDnuOx9heYHR9WG6HxcTxKEPqQVM7l079KO8pXAtwc6Rqs8nj85IprlrxcDFTvMwBieH bXHZ8FdD1AwmSZgOHN0TAWXl/NlLpptRNN2AEPuKlXPMEr1nIZB1cHnJiYMw2FBViSgVBf G3sKqIbMPlgPHNFOC/TeANt4eXFerQTc2/JC7gjCvMiK8YPdUilJaBhMeOIWuRGyss94z4 RnTxoeGImh3yx758tMwp7ouQZJ1/nvC7k8nD5jzTVhZo4GfIDc+dopnXX99Ibw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WZX2F4rnxzpc4; Thu, 1 Aug 2024 14:50:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 471EoTlo049562; Thu, 1 Aug 2024 14:50:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471EoToK049559; Thu, 1 Aug 2024 14:50:29 GMT (envelope-from git) Date: Thu, 1 Aug 2024 14:50:29 GMT Message-Id: <202408011450.471EoToK049559@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 7ffa3b0f69dc - stable/14 - Revert "loader/lua: Remove workaround for command_error" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7ffa3b0f69dcd59dc16dd652744a0d52d84954ed Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7ffa3b0f69dcd59dc16dd652744a0d52d84954ed commit 7ffa3b0f69dcd59dc16dd652744a0d52d84954ed Author: Warner Losh AuthorDate: 2024-07-29 22:57:13 +0000 Commit: Warner Losh CommitDate: 2024-08-01 14:49:54 +0000 Revert "loader/lua: Remove workaround for command_error" This reverts commit 552f3072af54820cf1805f712e2567bc1b7f046d. loader.command_error was added just after 11.2, but appears to not have been back ported to 11.x. 11.0 was the first lua loader release, so keep this compat shim until we sort out what to do. MFC After: 3 days Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D45883 (cherry picked from commit 809edb3636a5494ad7d3dfff910e0aab89d83442) --- stand/lua/config.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/stand/lua/config.lua b/stand/lua/config.lua index ba6144364247..86f5ef6174a2 100644 --- a/stand/lua/config.lua +++ b/stand/lua/config.lua @@ -407,7 +407,12 @@ local function loadModule(mod, silent) end if cli_execute_unparsed(str) ~= 0 then - print(loader.command_error()) + -- XXX Temporary shim: don't break the boot if + -- loader hadn't been recompiled with this + -- function exposed. + if loader.command_error then + print(loader.command_error()) + end if not silent then print("failed!") end