From owner-svn-src-head@freebsd.org Thu Mar 1 02:04:27 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 6F701F37BF3; Thu, 1 Mar 2018 02:04:27 +0000 (UTC) (envelope-from kevans@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 E8B36720C8; Thu, 1 Mar 2018 02:04:26 +0000 (UTC) (envelope-from kevans@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 E399B21E80; Thu, 1 Mar 2018 02:04:26 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2124Qow019691; Thu, 1 Mar 2018 02:04:26 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2124QkO019689; Thu, 1 Mar 2018 02:04:26 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803010204.w2124QkO019689@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 1 Mar 2018 02:04:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r330138 - head/stand/lua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/stand/lua X-SVN-Commit-Revision: 330138 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.25 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: Thu, 01 Mar 2018 02:04:27 -0000 Author: kevans Date: Thu Mar 1 02:04:26 2018 New Revision: 330138 URL: https://svnweb.freebsd.org/changeset/base/330138 Log: lualoader: Dedup these "Return to main menu" entries Modified: head/stand/lua/menu.lua Modified: head/stand/lua/menu.lua ============================================================================== --- head/stand/lua/menu.lua Thu Mar 1 01:49:36 2018 (r330137) +++ head/stand/lua/menu.lua Thu Mar 1 02:04:26 2018 (r330138) @@ -39,6 +39,10 @@ local drawer = require("drawer") local menu = {} local drawn_menu +local return_menu_entry = { + entry_type = core.MENU_RETURN, + name = "Back to main menu" .. color.highlight(" [Backspace]"), +} local function OnOff(str, value) if value then @@ -97,12 +101,8 @@ menu.handlers = { menu.boot_environments = { entries = { -- return to welcome menu + return_menu_entry, { - entry_type = core.MENU_RETURN, - name = "Back to main menu" .. - color.highlight(" [Backspace]"), - }, - { entry_type = core.MENU_CAROUSEL_ENTRY, carousel_id = "be_active", items = core.bootenvList, @@ -149,11 +149,7 @@ menu.boot_environments = { menu.boot_options = { entries = { -- return to welcome menu - { - entry_type = core.MENU_RETURN, - name = "Back to main menu" .. - color.highlight(" [Backspace]"), - }, + return_menu_entry, -- load defaults { entry_type = core.MENU_ENTRY,