From nobody Mon Jul 29 22:57:30 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 4WXtzZ4grkz5S8w1; Mon, 29 Jul 2024 22:57: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 4WXtzZ2Dnpz430j; Mon, 29 Jul 2024 22:57:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722293850; 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=o7OFyqTYO4wLcmNY3DtAsf+TvmtAFoOwEi4FgwyfUeo=; b=XT6AYPrazkh7wl4O2KPTi4QWAYPt4k8ErJqPCt2gZdG8L2EHHY4cWogTUjIt90l1bnO+g1 ddTYLAD9C0cn/N1WqwnPCPJH2DIwOWzxfKhh8oJ+MZR2Qp2dEhVaRRi9N/sbkgBwTumBDM 32m0+vQdPjDAJa3PzbMyGOEd/6PKopCp5iZIpljTecKGMartKQTnM+1U/Ns+4h7JGqRXn/ LHG5TdS8ek3LP6L9ehPreHD4s1hREojQ/BY1x7oI9vdOxUGBNqIkyCW8rNq7qD+mIOxtIm znNGY3fGae/qGQCfVAckhylDK8+VUnMMe5r8BHvEdkaikaawedy2deF7wBYQNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722293850; a=rsa-sha256; cv=none; b=edRGkIKfodOvXf5bVXOQ+zzelJh2vSd2Ya9kviW0ydZ67NprgNE3zFpnSvcgtG0Hn8eKdH hgLUVm74o/FZEmPlh2xUY9g8dJKvFBiSRGyRzmlex1bb6eMaeIs0S4A2CiZJJO0aeyKEs0 eroeq71bxmCsn8g5sTCSpUYdJUBVEbo8YbIQI7cq3+gkpUAIEfJBR+G3tQPcLLxUNnAPsE d5bu5iocK6Ocw/WvTasojLF7U+gSmgSfnfYdVZXyWV9CyIj6q+2NwidnHJfOhpKICfRl/l iolJKjb6c7kd+Cd7xyb6A66OTX+9yAZSHyTFIsUNiOtHagQuJ4szKHfVBTK5vA== 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=1722293850; 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=o7OFyqTYO4wLcmNY3DtAsf+TvmtAFoOwEi4FgwyfUeo=; b=WMnXGwtLO0p8nNIQG2phS1i6nBISOdmNvbl8Gkb+JudHCaMWNwDKej3TRSSxabfD//cvJn bNucpQ24TH9dYVNibNULfDeYtqImJ51IbTZQM6PyVrkrHGAgxdsZOCi5QI/vodGISBIsPi IC0uuaUdGZb+HI3LEdKhWbo0Pltwkv+aaM6hkfSCRTS+RGnHioIJTsjn7seKjzbLsjc91n GNMrxUFpJgojYvnUAZfk8SAYxhI3yHshlAzTTmaDCdJG01BNwfNBKRUzaB7oDn5hLDFaJF LBtQATbuVvu+oaUpVgmzfvGOCYsNUvMFlway5UBAIXqN9bFSG2QxcdLt4qpRpg== 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 4WXtzZ1jL4zt6G; Mon, 29 Jul 2024 22:57:30 +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 46TMvU0M049585; Mon, 29 Jul 2024 22:57:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46TMvUVC049582; Mon, 29 Jul 2024 22:57:30 GMT (envelope-from git) Date: Mon, 29 Jul 2024 22:57:30 GMT Message-Id: <202407292257.46TMvUVC049582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 809edb3636a5 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 809edb3636a5494ad7d3dfff910e0aab89d83442 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=809edb3636a5494ad7d3dfff910e0aab89d83442 commit 809edb3636a5494ad7d3dfff910e0aab89d83442 Author: Warner Losh AuthorDate: 2024-07-29 22:57:13 +0000 Commit: Warner Losh CommitDate: 2024-07-29 22:57:13 +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 --- 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