From nobody Thu Aug 01 14:50:27 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 4WZX2D0bqWz5St2Z; Thu, 01 Aug 2024 14:50: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 4WZX2C3NKvz4JNQ; Thu, 1 Aug 2024 14:50:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722523827; 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=6xXUZlDCtXy/HacouUME9z/sFdEDyiGUz/UepGlh9lQ=; b=XgPfaLTpPBzU82TyMlz9MZKBkIglW3WbgA8y4tUmT06bvpoxliBTAKTmb6F5/YZRUXsBGD h4E3R6UVxr+yb8jNiPIhLmQZgkNanhCYbawfIw4C59lWJEILWwOxccwZ0cS5zp3z+jkSbn Hg6Y7/gX7U3J5ImoGlnrTG5gNbiZWmwBItwpLjjsi9xXJrAm91w0P91+NSUBrrKbMM1Gqx rmyqlWp5qMBMmlN1L5kbZdw9Ch844IgX85teOV+3RXecW6kEha97XCULq3o6h6ABA/mosp S8iFj+69fJhSJZ9lysfJauHfFUZMLB7Bo9oKEVKdzb7klzg4MUUObFb1+tXK4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722523827; a=rsa-sha256; cv=none; b=VO8SBXM2XMpcKgwBFhVtx5a62Z9fS6zZTKLyaogwip37QzHA/rQXJMHpRVXeo7+8KeaYl6 NUe15RnbL+kYckB4JBju72fg84borro/KnZOmdwZFasPKpxl55juJzv2ElHjIUL/b5QD0C ea8XE2Hd5cpeBNTqTxDLNCQbi5o6utamyX6+XHsu+/mlFjsl8LgisxaUl4FhBeIr5kAh+R tSnwXZYMsYdghxV+Li25p6nmTo7Rm7nk9LdxOLCqyGEtUkeIBHUlrggBO04Y4EOb3ukKCn k0s22bwkSG72xzdZN1+ALNuT/9M/TUUz6FGAIgiVlICtbU9F3qqpL9WBPXaMOg== 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=1722523827; 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=6xXUZlDCtXy/HacouUME9z/sFdEDyiGUz/UepGlh9lQ=; b=ZiJndwFHX/xVQwFoK/fao6AXiQ5VVuOo6hLmC8s3GdcUV+uyyoqj19y5plW8G24f+gVv+H ljMHUrPnT4vqtU9wyCWCT+i+JG7axOHoS/N7GeCuvbWp6+E3gWhxnjopEZJKyiDZ7LQX2J fJhP5V0FvVAH7tqLZgWEJ8QFt0sX0MMp7IgVCjowinjCSCBEcgPDQRQZmJWnpYZTF4C3kx ujZvW49ZcdkHNFOatUjYRAIQCLZNqLZ/TEVttpC9Gpf9D/C8boogSGzdpZzo5G430SzI8q FJBJNKiJsezOuoIPuSfFm2T7oJNQ7Fb0d8X3EuhZYqVszkA6cyCXSQyo2C8xvg== 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 4WZX2C2zJBzpKJ; Thu, 1 Aug 2024 14:50: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 471EoRgd049463; Thu, 1 Aug 2024 14:50:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471EoRv5049460; Thu, 1 Aug 2024 14:50:27 GMT (envelope-from git) Date: Thu, 1 Aug 2024 14:50:27 GMT Message-Id: <202408011450.471EoRv5049460@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: 90ca43b5dcf0 - stable/14 - Revert "loader/lua: Remove pager shim" 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: 90ca43b5dcf0fbf6f28447a09aaee78ec3716d36 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=90ca43b5dcf0fbf6f28447a09aaee78ec3716d36 commit 90ca43b5dcf0fbf6f28447a09aaee78ec3716d36 Author: Warner Losh AuthorDate: 2024-07-29 22:56:55 +0000 Commit: Warner Losh CommitDate: 2024-08-01 14:49:54 +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 (cherry picked from commit b38a82c77ab90eace53c56151b191efd1f4a8439) --- 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.