From owner-svn-src-all@freebsd.org Tue Feb 20 21:15:44 2018 Return-Path: Delivered-To: svn-src-all@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 52A28F038DF; Tue, 20 Feb 2018 21:15:44 +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 0539370005; Tue, 20 Feb 2018 21:15:44 +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 00143715B; Tue, 20 Feb 2018 21:15:43 +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 w1KLFhmn078711; Tue, 20 Feb 2018 21:15:43 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1KLFhcP078710; Tue, 20 Feb 2018 21:15:43 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201802202115.w1KLFhcP078710@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Tue, 20 Feb 2018 21:15:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329670 - head/stand/lua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/stand/lua X-SVN-Commit-Revision: 329670 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Feb 2018 21:15:44 -0000 Author: kevans Date: Tue Feb 20 21:15:43 2018 New Revision: 329670 URL: https://svnweb.freebsd.org/changeset/base/329670 Log: lualoader: Don't try so hard to load a kernel If the user's selected a kernel, we really should be trying to load that one instead of falling back to some default kernel. This should generally be a no-op and most desirable, unless you really enjoyed surprises. Modified: head/stand/lua/config.lua Modified: head/stand/lua/config.lua ============================================================================== --- head/stand/lua/config.lua Tue Feb 20 21:13:21 2018 (r329669) +++ head/stand/lua/config.lua Tue Feb 20 21:15:43 2018 (r329670) @@ -437,11 +437,6 @@ function config.loadelf() loaded = config.loadkernel(kernel); if (not loaded) then - loaded = config.loadkernel(); - end - - if (not loaded) then - -- Ultimately failed to load kernel print("Failed to load any kernel"); return; end