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

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

Browse source 
* util/biosdisk.c (get_os_disk): Check for devfs-style IDE and SCSI
        discs unconditionaly, since udev and others have options to provide
        them.
This commit is contained in:
robertmh 2008-01-05 12:02:03 +00:00
parent d8b43d9b50
commit ddf8f6add7
2 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-01-05 Robert Millan <rmh@aybabtu.com>
* util/biosdisk.c (get_os_disk): Check for devfs-style IDE and SCSI
discs unconditionaly, since udev and others have options to provide
them.
2008-01-05 Robert Millan <rmh@aybabtu.com> 2008-01-05 Robert Millan <rmh@aybabtu.com>
* normal/completion.c (iterate_dir): Skip `.' and `..' directories. * normal/completion.c (iterate_dir): Skip `.' and `..' directories.

31
util/biosdisk.c
View file

@ -606,27 +606,24 @@ get_os_disk (const char *os_dev)
{ {
p = path + 5; p = path + 5;
if (have_devfs ()) /* If this is an IDE disk. */
if (strncmp ("ide/", p, 4) == 0)
{ {
/* If this is an IDE disk. */ p = strstr (p, "part");
if (strncmp ("ide/", p, 4) == 0) if (p)
{ strcpy (p, "disc");
p = strstr (p, "part");
if (p)
strcpy (p, "disc");
return path; return path;
} }
/* If this is a SCSI disk. */ /* If this is a SCSI disk. */
if (strncmp ("scsi/", p, 5) == 0) if (strncmp ("scsi/", p, 5) == 0)
{ {
p = strstr (p, "part"); p = strstr (p, "part");
if (p) if (p)
strcpy (p, "disc"); strcpy (p, "disc");
return path; return path;
}
} }
/* If this is a DAC960 disk. */ /* If this is a DAC960 disk. */