bin/184411: New boot menu doesn't load modules correctly

[Arseny Nasokin]

>Number:         184411
>Category:       bin
>Synopsis:       New boot menu doesn't load modules correctly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 01 16:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Arseny Nasokin
>Release:        FreeBSD 11-CURRENT r2578777
>Organization:
private person
>Environment:
FreeBSD FBSD258526.local 11.0-CURRENT FreeBSD 11.0-CURRENT #0 r258777: Sat Nov 30 23:14:49 UTC 2013     root at eroese.org:/usr/obj/usr/src/sys/GENERIC_PF  amd64
>Description:
New kernel switching feature doesn't respect kernel path to load with.
>How-To-Repeat:
put 
zfs_load="YES" on your /boot/loader.conf and use menu to boot
>Fix:
patch has been attached

Patch attached with submission follows:

diff -ru boit/boot/beastie.4th /boot/beastie.4th
--- boit/boot/beastie.4th	2013-11-30 23:23:36.000000000 +0000
+++ /boot/beastie.4th	2013-12-01 15:45:17.000000000 +0000
@@ -246,8 +246,7 @@
 	dup -1 <> if
 		s" YES" compare-insensitive 0= if
 			any_conf_read? if
-				load_kernel
-				load_modules
+				load_kernel_and_modules
 			then
 			exit \ to autoboot (default)
 		then
diff -ru boit/boot/loader.4th /boot/loader.4th
--- boit/boot/loader.4th	2013-11-30 23:23:36.000000000 +0000
+++ /boot/loader.4th	2013-12-01 15:45:55.000000000 +0000
@@ -143,8 +143,7 @@
   \ was succesfully loaded!
   any_conf_read? if
     s" loader_delay" getenv -1 = if
-      load_kernel
-      load_modules
+      load_kernel_and_modules
     else
       drop
       ." Loading Kernel and Modules (Ctrl-C to Abort)" cr


>Release-Note:
>Audit-Trail:
>Unformatted: