socsvn commit: r271954 - soc2014/pedrosouza/lua_loader/head/sys/boot/lua

[pedrosouza at FreeBSD.org]

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