2010-11-30 Robert Millan <rmh@gnu.org>

	* grub-core/loader/i386/bsd.c
	(grub_cmd_freebsd_loadenv, grub_cmd_freebsd_module_elf): Check
	whether kernel is loaded using grub_loader_is_loaded(), rather
	than `kernel_type', which may still be `KERNEL_TYPE_NONE' under
	certain error conditions.

diff --git a/ChangeLog b/ChangeLog
index e8bcdb549e3e2d587b50be41e9f0c7712cd0dfad..33004a8c8c1cd165ba8d413b095bc306de8f0a84 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-30  Robert Millan  <rmh@gnu.org>
+
+       * grub-core/loader/i386/bsd.c
+       (grub_cmd_freebsd_loadenv, grub_cmd_freebsd_module_elf): Check
+       whether kernel is loaded using grub_loader_is_loaded(), rather
+       than `kernel_type', which may still be `KERNEL_TYPE_NONE' under
+       certain error conditions.
+
 2010-11-30  Robert Millan  <rmh@gnu.org>
 
        * grub-core/commands/echo.c: Include `<grub/term.h>'.

diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
index b7cf115d918c3a9d0f78bfcc266557c0c1e4b5b1..91cae418cad4bba860e52cdeabf3a6f11d74d1cc 100644 (file)
--- a/grub-core/loader/i386/bsd.c
+++ b/grub-core/loader/i386/bsd.c
@@ -1611,7 +1611,7 @@ grub_cmd_freebsd_loadenv (grub_command_t cmd __attribute__ ((unused)),
   char *buf = 0, *curr, *next;
   int len;
 
-  if (kernel_type == KERNEL_TYPE_NONE)
+  if (! grub_loader_is_loaded ())
     return grub_error (GRUB_ERR_BAD_ARGUMENT,
                       "you need to load the kernel first");
 
@@ -1844,7 +1844,7 @@ grub_cmd_freebsd_module_elf (grub_command_t cmd __attribute__ ((unused)),
   grub_file_t file = 0;
   grub_err_t err;
 
-  if (kernel_type == KERNEL_TYPE_NONE)
+  if (! grub_loader_is_loaded ())
     return grub_error (GRUB_ERR_BAD_ARGUMENT,
                       "you need to load the kernel first");