From nobody Mon Jul 29 22:57:27 2024 X-Original-To: dev-commits-src-main@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 4WXtzX21Djz5S8hc; Mon, 29 Jul 2024 22:57:28 +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 4WXtzX069nz439l; Mon, 29 Jul 2024 22:57:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722293848; 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=Juzr7YBcYfAeKuGQiKjug9XljvxGnSniztryAgtmsiY=; b=pP2xicrJfErJR7PuY/+0bVX25sBrq7zjcmqH/gryLbk0y7KM6BKiNM7kPhrHFagBRcFN3s ZmnNdVG3W5zOBG5hxU3FWbtyEzTxG+z3KLqKOCsDr1QpFBjnSppn8RgbnAzMfcBVaIjnx6 O8+7GPZ3bBKNvSIEUXDr+dXomi1dFopFpnPUSFdnqrtkN+VtFC1V8S8E/ekMEA7As2yXlV TqsQ6v65+zkgmH95dFNKjlFRwXPnRcJxww4Dv6oJi4LQiwtoTsLkKc7xuwTSAm50ATCigl 6qrMG5gi+v9CGnQCGnO5E4aMns5C84bh/tBHZKceht7mb9a6r1SPrplvSP5fPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722293848; a=rsa-sha256; cv=none; b=S5qS+FNQvyQZs40XRs27tOQiBwhiD3leYWdV9Bgnf0s3pxzHYtBQhvnuLVI4S2O3/scXR9 AignY1/TQQhEApuCykbT4yKbFo67Hb3X28JsXiU6UDQf5QRYV3BGDL5zAjE/IczNYBphk/ p0NMHhxVpV3qPJBGPChiIXbqWEg9mOzyZfENfsjhFFeGoaUoa3jCf2PSsmXTJxIgQrVMvH RFO3FZyYEu0Hjo1y4ydKZWGaVqBm0JbHdx3J1clnMyjEb/pgqKQvhkOq6Usg+vs8OiXQc7 jq7E5/rkFsV683hRDLYiHdICjS7ZNgck4OI6QssMfNTJR+lR4/2Q35irMOTgVA== 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=1722293848; 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=Juzr7YBcYfAeKuGQiKjug9XljvxGnSniztryAgtmsiY=; b=KBWAsQIYgneAUMVwK+ZO0qU2MsvyB445oFa6m4pt6PEWN7F1g0oLEe0l6S+S2xrfcZ6EXw cSfUr9fxtgHkbPOiFQGvoBuQY1UaVccQbS7qUBDBXfMr5CHKyksYY85s5mZBJ0zzJKA8ii I4SORR+INifp1BMyoa5B9TTCklBZSotle5IpolpabuOJDggWcsE8Ve6EQe2kg186lMupg1 nCK3DHQxQjo1Nad6R2iuWc5qhFmg6Hs7sFdofMHS1kURjObmJedEkH5WlWzOsRk2EG8s6p DLwrKBoGYIVpQVFbwLL0drMBXqOYxXEK/ZsBsjKPdgEFbTnprf31nrhvTM/xAA== 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 4WXtzW6pHfztC4; Mon, 29 Jul 2024 22:57:27 +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 46TMvRsP049491; Mon, 29 Jul 2024 22:57:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46TMvReZ049488; Mon, 29 Jul 2024 22:57:27 GMT (envelope-from git) Date: Mon, 29 Jul 2024 22:57:27 GMT Message-Id: <202407292257.46TMvReZ049488@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: b38a82c77ab9 - main - Revert "loader/lua: Remove pager shim" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: b38a82c77ab90eace53c56151b191efd1f4a8439 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b38a82c77ab90eace53c56151b191efd1f4a8439 commit b38a82c77ab90eace53c56151b191efd1f4a8439 Author: Warner Losh AuthorDate: 2024-07-29 22:56:55 +0000 Commit: Warner Losh CommitDate: 2024-07-29 22:56:55 +0000 Revert "loader/lua: Remove pager shim" This reverts commit 8b9178cd0d35ff2beafebdd51c8c44ba2b5aeb0f. Really old loader.efi files persist in the field. Revert this to support it. We need to support this through at least 14.2 now, alas. MFC After: 3 days Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D45881 --- stand/lua/cli.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/stand/lua/cli.lua b/stand/lua/cli.lua index 596e55a8d1d8..6832da0a31a5 100644 --- a/stand/lua/cli.lua +++ b/stand/lua/cli.lua @@ -30,6 +30,18 @@ local core = require("core") local cli = {} +if not pager then + -- shim for the pager module that just doesn't do it. + -- XXX Remove after 12.2 goes EoL. + pager = { + open = function() end, + close = function() end, + output = function(str) + printc(str) + end, + } +end + -- Internal function -- Parses arguments to boot and returns two values: kernel_name, argstr -- Defaults to nil and "" respectively.