From owner-svn-src-head@freebsd.org Mon Aug 20 16:44:11 2018 Return-Path: Delivered-To: svn-src-head@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 E99C710755D0; Mon, 20 Aug 2018 16:44:10 +0000 (UTC) (envelope-from imp@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 9488276B2A; Mon, 20 Aug 2018 16:44:10 +0000 (UTC) (envelope-from imp@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 746B317EC7; Mon, 20 Aug 2018 16:44:10 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7KGiAto090969; Mon, 20 Aug 2018 16:44:10 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7KGiAwR090966; Mon, 20 Aug 2018 16:44:10 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201808201644.w7KGiAwR090966@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 20 Aug 2018 16:44:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r338108 - head/stand/lua X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/stand/lua X-SVN-Commit-Revision: 338108 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Aug 2018 16:44:11 -0000 Author: imp Date: Mon Aug 20 16:44:09 2018 New Revision: 338108 URL: https://svnweb.freebsd.org/changeset/base/338108 Log: Serial console menus for lua. Remove a bunch of special cases for UEFI and serial consoles. We do want to do curses and menu things here. This makes us match what we do in FORTH, with the possible exception of boxes around menus. Differential Revision: https://reviews.freebsd.org/D16816 Modified: head/stand/lua/core.lua head/stand/lua/screen.lua Modified: head/stand/lua/core.lua ============================================================================== --- head/stand/lua/core.lua Mon Aug 20 15:57:27 2018 (r338107) +++ head/stand/lua/core.lua Mon Aug 20 16:44:09 2018 (r338108) @@ -310,14 +310,6 @@ function core.isZFSBoot() end function core.isSerialBoot() - local c = loader.getenv("console") - - if c ~= nil then - if c:find("comconsole") ~= nil then - return true - end - end - local s = loader.getenv("boot_serial") if s ~= nil then return true @@ -336,14 +328,6 @@ end -- Is the menu skipped in the environment in which we've booted? function core.isMenuSkipped() - if core.isSerialBoot() then - return true - end - local c = string.lower(loader.getenv("console") or "") - if c:match("^efi[ ;]") ~= nil or c:match("[ ;]efi[ ;]") ~= nil then - return true - end - c = string.lower(loader.getenv("beastie_disable") or "") return c == "yes" end Modified: head/stand/lua/screen.lua ============================================================================== --- head/stand/lua/screen.lua Mon Aug 20 15:57:27 2018 (r338107) +++ head/stand/lua/screen.lua Mon Aug 20 16:44:09 2018 (r338108) @@ -38,17 +38,10 @@ screen.default_x = 0 screen.default_y = 25 function screen.clear() - if core.isSerialBoot() then - return - end printc(core.KEYSTR_CSI .. "H" .. core.KEYSTR_CSI .. "J") end function screen.setcursor(x, y) - if core.isSerialBoot() then - return - end - printc(core.KEYSTR_CSI .. y .. ";" .. x .. "H") end @@ -71,9 +64,6 @@ function screen.defcolor() end function screen.defcursor() - if core.isSerialBoot() then - return - end screen.setcursor(screen.default_x, screen.default_y) end