Both boot and boot-conf were using a different algorithm from the one

used by start to find the kernel. Fix this.

Also, boot would proceed immediately in the absence of a path as
argument. Check first if a kernel has already been loaded, and, if
not, fall back to load kernel&modules behavior.

Some further factorizing. I deem this code to be mostly readable by
now! :-)

Many thanks to: Makoto MATSUSHITA <matusita@jp.FreeBSD.org>

1 files changed, 10 insertions, 2 deletions

diff --git a/sys/boot/forth/loader.4th b/sys/boot/forth/loader.4th
index a125e70..69a1614 100644
--- a/sys/boot/forth/loader.4th
+++ b/sys/boot/forth/loader.4th
@@ -65,19 +65,27 @@ only forth also support-functions also builtins definitions
     c@ [char] - <> if
       0 1 unload drop
     else
+      s" kernelname" getenv? 0= if ( no kernel has been loaded )
+	load_conf
+	?dup if exit then
+      then
       1 boot exit
     then
   else
+    s" kernelname" getenv? 0= if ( no kernel has been loaded )
+      load_conf
+      ?dup if exit then
+    then
     1 boot exit
   then
-  load-conf
+  load_conf
   ?dup 0= if 0 1 boot then
 ;
 
 : boot-conf
   0= if ( interpreted ) get-arguments then
   0 1 unload drop
-  load-conf
+  load_conf
   ?dup 0= if 0 1 autoboot then
 ;