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

2008-05-31 Robert Millan <rmh@aybabtu.com>

Browse source 
* disk/i386/pc/biosdisk.c (grub_biosdisk_iterate): Iterate through
        floppies after everything else, to ensure floppy drive isn't accessed
        unnecessarily (patch from Bean).
This commit is contained in:
robertmh 2008-05-31 21:14:27 +00:00
parent b7db5d47d9
commit c682dfd71d
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-05-31 Robert Millan <rmh@aybabtu.com>
* disk/i386/pc/biosdisk.c (grub_biosdisk_iterate): Iterate through
floppies after everything else, to ensure floppy drive isn't accessed
unnecessarily (patch from Bean).
2008-05-31 Robert Millan <rmh@aybabtu.com> 2008-05-31 Robert Millan <rmh@aybabtu.com>
* commands/search.c (search_label, search_fs_uuid, search_file): Do * commands/search.c (search_label, search_fs_uuid, search_file): Do

12
disk/i386/pc/biosdisk.c
View file

@ -66,12 +66,6 @@ grub_biosdisk_iterate (int (*hook) (const char *name))
int drive; int drive;
int num_floppies; int num_floppies;
/* For floppy disks, we can get the number safely. */
num_floppies = grub_biosdisk_get_num_floppies ();
for (drive = 0; drive < num_floppies; drive++)
if (grub_biosdisk_call_hook (hook, drive))
return 1;
/* For hard disks, attempt to read the MBR. */ /* For hard disks, attempt to read the MBR. */
for (drive = 0x80; drive < 0x90; drive++) for (drive = 0x80; drive < 0x90; drive++)
{ {
@ -92,6 +86,12 @@ grub_biosdisk_iterate (int (*hook) (const char *name))
return 1; return 1;
} }
/* For floppy disks, we can get the number safely. */
num_floppies = grub_biosdisk_get_num_floppies ();
for (drive = 0; drive < num_floppies; drive++)
if (grub_biosdisk_call_hook (hook, drive))
return 1;
return 0; return 0;
} }