I haven't fixed the real cause of the bug in embed_func yet, but
this patch will purge it. Anyway, this patch is necessary to make the
command "setup" more robust. Gordon, please apply this, and you don't
have to wait until I fix the cause any longer. I will fix it in the
next version.
Index: ChangeLog
===================================================================
RCS file: /home/cvs/grub/ChangeLog,v
retrieving revision 1.326.2.7
diff -u -r1.326.2.7 ChangeLog
--- ChangeLog 2000/10/05 17:12:39 1.326.2.7
+++ ChangeLog 2000/10/06 11:14:38
@@ -1,3 +1,10 @@
+2000-10-06 OKUJI Yoshinori <[EMAIL PROTECTED]>
+
+ * stage2/builtins.c (setup_func): Append "... " to the
+ messages when calling embed_func and install_func, and print
+ the result.
+ Don't jump to the label "fail", even when embed_func failed.
+
2000-10-05 Gordon Matzigkeit <[EMAIL PROTECTED]>
* stage2/disk_io.c (real_open_partition): Make sure that buf_geom
Index: stage2/builtins.c
===================================================================
RCS file: /home/cvs/grub/stage2/builtins.c,v
retrieving revision 1.84
diff -u -r1.84 builtins.c
--- stage2/builtins.c 2000/09/29 18:55:27 1.84
+++ stage2/builtins.c 2000/10/06 11:14:39
@@ -3506,7 +3506,7 @@
grub_sprintf (cmd_arg, "%s %s", stage2, device);
/* Notify what will be run. */
- grub_printf (" Running \"embed %s\"\n", cmd_arg);
+ grub_printf (" Running \"embed %s\"... ", cmd_arg);
embed_func (cmd_arg, flags);
if (! errnum)
@@ -3519,9 +3519,13 @@
sprint_device (image_drive, image_partition);
grub_sprintf (buffer, "%s%s", device, config_filename);
grub_strcpy (config_filename, buffer);
+
+ grub_printf ("succeeded\n");
}
else
- goto fail;
+ {
+ grub_printf ("failed (This is not fatal)\n");
+ }
}
else if (fsys_table[fsys_type].embed_func != 0)
{
@@ -3568,7 +3572,7 @@
#endif /* ! NO_BUGGY_BIOS_IN_THE_WORLD */
/* Notify what will be run. */
- grub_printf (" Running \"install %s\"\n", cmd_arg);
+ grub_printf (" Running \"install %s\"... ", cmd_arg);
/* Make sure that SAVED_DRIVE and SAVED_PARTITION are identical
with IMAGE_DRIVE and IMAGE_PARTITION, respectively. */
@@ -3577,7 +3581,9 @@
/* Run the command. */
if (! install_func (cmd_arg, flags))
- grub_printf ("Done.\n");
+ grub_printf ("succeeded\nDone.\n");
+ else
+ grub_printf ("failed\n");
fail:
saved_drive = tmp_drive;
_______________________________________________
Bug-grub mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/bug-grub
