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

2010-02-06 Vladimir Serbinenko <phcoder@gmail.com>

Browse source 
* fs/i386/pc/pxe.c (grub_pxefs_dir): Return with failure on
	non-pxe disk.
	(grub_pxefs_open): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-02-06 15:25:59 +01:00
parent 7cc192d9f2
commit 3746a6bc31
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2010-02-06 Vladimir Serbinenko <phcoder@gmail.com>
* fs/i386/pc/pxe.c (grub_pxefs_dir): Return with failure on
non-pxe disk.
(grub_pxefs_open): Likewise.
2010-02-06 Colin D Bennett <colin@gibibit.com> 2010-02-06 Colin D Bennett <colin@gibibit.com>
* conf/common.rmk (pkglib_MODULES): Add gfxmenu.mod. * conf/common.rmk (pkglib_MODULES): Add gfxmenu.mod.

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

@ -173,12 +173,15 @@ static struct grub_disk_dev grub_pxe_dev =
}; };
static grub_err_t static grub_err_t
grub_pxefs_dir (grub_device_t device __attribute__ ((unused)), grub_pxefs_dir (grub_device_t device,
const char *path __attribute__ ((unused)), const char *path __attribute__ ((unused)),
int (*hook) (const char *filename, int (*hook) (const char *filename,
const struct grub_dirhook_info *info) const struct grub_dirhook_info *info)
__attribute__ ((unused))) __attribute__ ((unused)))
{ {
if (device->disk->dev->id != GRUB_DISK_DEVICE_PXE_ID)
return grub_error (GRUB_ERR_IO, "not a pxe disk");
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
@ -194,6 +197,9 @@ grub_pxefs_open (struct grub_file *file, const char *name)
struct grub_pxe_disk_data *disk_data = file->device->disk->data; struct grub_pxe_disk_data *disk_data = file->device->disk->data;
grub_file_t file_int, bufio; grub_file_t file_int, bufio;
if (file->device->disk->dev->id != GRUB_DISK_DEVICE_PXE_ID)
return grub_error (GRUB_ERR_IO, "not a pxe disk");
if (curr_file != 0) if (curr_file != 0)
{ {
grub_pxe_call (GRUB_PXENV_TFTP_CLOSE, &c.c2); grub_pxe_call (GRUB_PXENV_TFTP_CLOSE, &c.c2);