mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-20 22:48:22 +00:00
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.
This commit is contained in:
1 parent
d8b43d9b50
commit
ddf8f6add7
2 files changed
+23
-20
No files matched your search
@@ -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.
|
||||||
|
|||||||
+17
-20
@@ -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)
|
return path;
|
||||||
strcpy (p, "disc");
|
}
|
||||||
|
|
||||||
return path;
|
/* If this is a SCSI disk. */
|
||||||
}
|
if (strncmp ("scsi/", p, 5) == 0)
|
||||||
|
{
|
||||||
/* If this is a SCSI disk. */
|
p = strstr (p, "part");
|
||||||
if (strncmp ("scsi/", p, 5) == 0)
|
if (p)
|
||||||
{
|
strcpy (p, "disc");
|
||||||
p = strstr (p, "part");
|
|
||||||
if (p)
|
return path;
|
||||||
strcpy (p, "disc");
|
|
||||||
|
|
||||||
return path;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If this is a DAC960 disk. */
|
/* If this is a DAC960 disk. */
|
||||||
|
|||||||
Reference in new issue
Block a user