vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2009-06-09 Michel Hermier <michel.hermier@gmail.com>

Browse source 
* fs/i386/pc/pxe.c (grub_pxefs_read): Fix returned values.
This commit is contained in:
phcoder 2009-06-09 19:08:36 +00:00
parent 87b8f28cc1
commit afd22553a6
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,18 +1,12 @@
2009-06-09 Robert Millan <rmh.grub@aybabtu.com>
2009-06-09 Michel Hermier <michel.hermier@gmail.com>
* util/deviceiter.c (grub_util_iterate_devices): Increase number of
disk limit to 26 for IDE, Virtio, Xen and SCSI.
2009-06-09 Felix Zielcke <fzielcke@z-51.de>
* util/i386/pc/grub-install.in: Change the error message if UUIDs
aren't avaible if ata.mod gets used.
* fs/i386/pc/pxe.c (grub_pxefs_read): Fix returned values.
2009-06-09 Oliver Henshaw <oliver.henshaw@gmail.com>
* bus/usb/ohci.c (grub_ohci_pci_iter): Link struct only after
* bus/usb/ohci.c (grub_ohci_pci_iter): Link struct only after
initialising controller.
* bus/usb/uhci.c (grub_uhci_pci_iter): Likewise.
* bus/usb/uhci.c (grub_uhci_pci_iter): Likewise.
2009-06-08 Felix Zielcke <fzielcke@z-51.de>

12
fs/i386/pc/pxe.c
View file

@ -189,8 +189,11 @@ grub_pxefs_read (grub_file_t file, char *buf, grub_size_t len)
pn = grub_divmod64 (file->offset, data->block_size, &r);
if (r)
return grub_error (GRUB_ERR_BAD_FS,
"read access must be aligned to packet size");
{
grub_error (GRUB_ERR_BAD_FS,
"read access must be aligned to packet size");
return -1;
}
if ((curr_file != file) || (data->packet_number > pn))
{
@ -206,7 +209,10 @@ grub_pxefs_read (grub_file_t file, char *buf, grub_size_t len)
o.packet_size = data->block_size;
grub_pxe_call (GRUB_PXENV_TFTP_OPEN, &o);
if (o.status)
return grub_error (GRUB_ERR_BAD_FS, "open fails");
{
grub_error (GRUB_ERR_BAD_FS, "open fails");
return -1;
}
data->packet_number = 0;
curr_file = file;
}