From owner-svn-soc-all@FreeBSD.ORG  Tue Aug  5 19:29:50 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B00B7E3
 for <svn-soc-all@FreeBSD.org>; Tue,  5 Aug 2014 19:29:50 +0000 (UTC)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9D3682AF8
 for <svn-soc-all@FreeBSD.org>; Tue,  5 Aug 2014 19:29:50 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s75JTo0G054831
 for <svn-soc-all@FreeBSD.org>; Tue, 5 Aug 2014 19:29:50 GMT
 (envelope-from pedrosouza@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s75JToS5054829
 for svn-soc-all@FreeBSD.org; Tue, 5 Aug 2014 19:29:50 GMT
 (envelope-from pedrosouza@FreeBSD.org)
Date: Tue, 5 Aug 2014 19:29:50 GMT
Message-Id: <201408051929.s75JToS5054829@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 pedrosouza@FreeBSD.org using -f
From: pedrosouza@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r271954 -
 soc2014/pedrosouza/lua_loader/head/sys/boot/lua
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Aug 2014 19:29:50 -0000

Author: pedrosouza
Date: Tue Aug  5 19:29:49 2014
New Revision: 271954
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271954

Log:
  added default kernel name to config.loadkernel

Modified:
  soc2014/pedrosouza/lua_loader/head/sys/boot/lua/config.lua

Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/config.lua
==============================================================================
--- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/config.lua	Tue Aug  5 18:51:51 2014	(r271953)
+++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/config.lua	Tue Aug  5 19:29:49 2014	(r271954)
@@ -206,12 +206,15 @@
     
     local load_bootfile = function()
         local bootfile = loader.getenv("bootfile");
-        local res = nil;
-        if bootfile ~= nil then
-            return try_load(bootfile);
+        
+        -- append default kernel name
+        if not bootfile then
+            bootfile = "kernel";
+        else
+            bootfile = bootfile..";kernel";
         end
-        print("Kernel loading failed: null bootfile!\n");
-        return nil;
+        
+        return try_load(bootfile);
     end;
     
     -- kernel not set, try load from default module_path