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

2005-07-31 Yoshinori K. Okuji <okuji@enbug.org>

Browse source 
* loader/i386/pc/multiboot.c (grub_multiboot_is_elf32): New
	function.
	(grub_multiboot_load_elf32): Likewise.
	(grub_multiboot_is_elf64): Likewise.
	(grub_multiboot_load_elf64): Likewise.
	(grub_multiboot_load_elf): Likewise.
	(grub_rescue_cmd_multiboot): Call grub_multiboot_load_elf to load
	an ELF32 or ELF64 file.
	This is based on a patch from Ruslan Nikolaev <nruslan@mail.com>.

	From Serbinenko Vladimir <serbinenko.vova@list.ru>:
	* kern/disk.c (grub_print_partinfo): Check if FS->LABEL is not
	NULL before calling FS->LABEL.
	* fs/fat.c (grub_fat_dir): Initialize DIRNAME to NULL.
	* commands/ls.c (grub_ls_list_files): Show labels, if possible.
	(grub_ls_list_disks): Check if FS and FS->LABEL are not NULL
	before calling FS->LABEL.
This commit is contained in:
okuji 2005-07-31 16:12:29 +00:00
parent 141a288bb0
commit ea4097134f
6 changed files with 222 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kern/disk.c
View file

@ -535,7 +535,7 @@ grub_print_partinfo (grub_device_t disk, char *partname)
grub_printf ("\tPartition num:%s, Filesystem type %s",
partname, fs ? fs->name : "Unknown");
if (fs)
if (fs && fs->label)
{
(fs->label) (part, &label);
if (grub_errno == GRUB_ERR_NONE)