2006-02-01 Yoshinori K. Okuji <okuji@enbug.org>

        * boot/i386/pc/boot.S (general_error): Before looping, try INT
        18H, which might help the BIOS falling back to next boot media.

diff --git a/ChangeLog b/ChangeLog
index 4a464df04eec8ff6df48907b39e5ec522523fd33..8bfb53a8d211fc428f51e924686510320aa1c012 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-01  Yoshinori K. Okuji  <okuji@enbug.org>
+
+       * boot/i386/pc/boot.S (general_error): Before looping, try INT
+       18H, which might help the BIOS falling back to next boot media.
+
 2006-01-25  Yoshinori K. Okuji  <okuji@enbug.org>
 
        * util/i386/pc/grub-install.in: Escape a backslash. Reported by

diff --git a/boot/i386/pc/boot.S b/boot/i386/pc/boot.S
index 13ecca7758a71608f7b7b76d943e5309f4be6514..3e94d599e6342b1c529e81c1f3cee563f985f004 100644 (file)
--- a/boot/i386/pc/boot.S
+++ b/boot/i386/pc/boot.S
@@ -397,6 +397,8 @@ general_error:
        MSG(general_error_string)
 
 /* go here when you need to stop the machine hard after an error condition */
+        /* tell the BIOS a boot failure, which may result in no effect */
+        int    $0x18
 stop:  jmp     stop
 
 notification_string:   .string "GRUB "

diff --git a/include/grub/i386/pc/multiboot.h b/include/grub/i386/pc/multiboot.h
index dea3b708b1aab9eb7caa48f0af8e76f74a261c17..fb18725d3bf98ecf178b9ea184417ada265d9dde 100644 (file)
--- a/include/grub/i386/pc/multiboot.h
+++ b/include/grub/i386/pc/multiboot.h
@@ -121,7 +121,7 @@ struct grub_multiboot_header
 
 struct grub_multiboot_info
 {
-  /* MultiBoot info version number */
+  /* Multiboot info version number */
   grub_uint32_t flags;
   
   /* Available memory from BIOS */