From owner-svn-src-head@freebsd.org Mon Feb 19 16:36:30 2018
Return-Path: <owner-svn-src-head@freebsd.org>
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 67A83F0E4ED;
Mon, 19 Feb 2018 16:36:30 +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 1D9857E1B5;
Mon, 19 Feb 2018 16:36:30 +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 187D81D0BA;
Mon, 19 Feb 2018 16:36:30 +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 w1JGaTPr003688;
Mon, 19 Feb 2018 16:36:29 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1JGaTci003687;
Mon, 19 Feb 2018 16:36:29 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <201802191636.w1JGaTci003687@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Mon, 19 Feb 2018 16:36:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r329587 - head/stand/lua
X-SVN-Group: head
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: head/stand/lua
X-SVN-Commit-Revision: 329587
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
<svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Feb 2018 16:36:30 -0000
Author: kevans
Date: Mon Feb 19 16:36:29 2018
New Revision: 329587
URL: https://svnweb.freebsd.org/changeset/base/329587
Log:
stand/lua: Swap single-/multi- user boot entries as needed
Modified:
head/stand/lua/menu.lua
Modified: head/stand/lua/menu.lua
==============================================================================
--- head/stand/lua/menu.lua Mon Feb 19 16:35:46 2018 (r329586)
+++ head/stand/lua/menu.lua Mon Feb 19 16:36:29 2018 (r329587)
@@ -133,7 +133,19 @@ menu.boot_options = {
};
menu.welcome = {
- entries = {
+ entries = function()
+ local menu_entries = menu.welcome.all_entries;
+ -- Swap the first two menu items on single user boot
+ if (core.isSingleUserBoot()) then
+ local multiuser = menu_entries[1];
+ local singleuser = menu_entries[2];
+
+ menu_entries[2] = multiuser;
+ menu_entries[1] = singleuser;
+ end
+ return menu_entries;
+ end,
+ all_entries = {
-- boot multi user
{
entry_type = core.MENU_ENTRY,