2002-05-22 Yoshinori K. Okuji <okuji@enbug.org>

	* stage2/builtins.c (boot_func): If DEBUG is true, print
	BOOT_DRIVE and BOOT_PART_OFFSET.
	Don't set ERRNUM after rawread failed, because rawread should
	set ERRNUM itself.

diff --git a/ChangeLog b/ChangeLog
index 666b14e91863e65c5f34a4daa57a58cc9fd319cd..b85012acbf893060e98ab9746fe4ce9d7e8eb249 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-05-22  Yoshinori K. Okuji  <okuji@enbug.org>
+
+       * stage2/builtins.c (boot_func): If DEBUG is true, print
+       BOOT_DRIVE and BOOT_PART_OFFSET.
+       Don't set ERRNUM after rawread failed, because rawread should
+       set ERRNUM itself.
+       
 2002-05-20  Yoshinori K. Okuji  <okuji@enbug.org>
 
        * lib/device.c (read_device_map): Show an error message and exit

diff --git a/stage2/builtins.c b/stage2/builtins.c
index 7ed397bf22725dd9b0154c5dd9e294dfabaf7802..01132df9c76dc433dc9820d2e1930536dfef2e02 100644 (file)
--- a/stage2/builtins.c
+++ b/stage2/builtins.c
@@ -301,6 +301,10 @@ boot_func (char *arg, int flags)
        {
          char *dst, *src;
          int i;
+
+         if (debug)
+           grub_printf ("reading the offset 0x%x in the drive 0x%x\n",
+                        boot_drive, boot_part_offset);
          
          /* Read the MBR here, because it might be modified
             after opening the partition.  */
@@ -308,7 +312,6 @@ boot_func (char *arg, int flags)
                         0, SECTOR_SIZE, (char *) SCRATCHADDR))
            {
              /* This should never happen.  */
-             errnum = ERR_READ;
              return 0;
            }