Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-21 06:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

* grub-core/fs/i386/pc/pxe.c (grub_pxefs_dir): Return

Browse Source 
GRUB_ERR_BAD_FS rather than GRUB_ERR_IO if the disk is not a pxe
disk; otherwise grub_fs_probe will not fall back to the next
filesystem.
(grub_pxefs_open): Likewise, for consistency.
Reported and tested by: Ezekiel Grave.
This commit is contained in:
Colin Watson committed 2011-05-03 18:03:05 +01:00
1 parent 4ebff75340
commit bd405bbc55
2 files changed
+11 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ChangeLog
+9
View File
@@ -1,3 +1,12 @@
2011-05-03 Colin Watson <cjwatson@ubuntu.com>
* grub-core/fs/i386/pc/pxe.c (grub_pxefs_dir): Return
GRUB_ERR_BAD_FS rather than GRUB_ERR_IO if the disk is not a pxe
disk; otherwise grub_fs_probe will not fall back to the next
filesystem.
(grub_pxefs_open): Likewise, for consistency.
Reported and tested by: Ezekiel Grave.
2011-05-03 Colin Watson <cjwatson@ubuntu.com> 2011-05-03 Colin Watson <cjwatson@ubuntu.com>
* tests/partmap_test.in: Don't hardcode path to parted. * tests/partmap_test.in: Don't hardcode path to parted.
grub-core/fs/i386/pc/pxe.c
+2 -2
View File
@@ -227,7 +227,7 @@ grub_pxefs_dir (grub_device_t device,
__attribute__ ((unused))) __attribute__ ((unused)))
{ {
if (device->disk->dev->id != GRUB_DISK_DEVICE_PXE_ID) if (device->disk->dev->id != GRUB_DISK_DEVICE_PXE_ID)
return grub_error (GRUB_ERR_IO, "not a pxe disk"); return grub_error (GRUB_ERR_BAD_FS, "not a pxe disk");
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
@@ -245,7 +245,7 @@ grub_pxefs_open (struct grub_file *file, const char *name)
grub_file_t file_int, bufio; grub_file_t file_int, bufio;
if (file->device->disk->dev->id != GRUB_DISK_DEVICE_PXE_ID) if (file->device->disk->dev->id != GRUB_DISK_DEVICE_PXE_ID)
return grub_error (GRUB_ERR_IO, "not a pxe disk"); return grub_error (GRUB_ERR_BAD_FS, "not a pxe disk");
if (curr_file != 0) if (curr_file != 0)
{ {