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:
parent
d8b43d9b50
commit
ddf8f6add7
2 changed files with 23 additions and 20 deletions
|
@ -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>
|
||||
|
||||
* normal/completion.c (iterate_dir): Skip `.' and `..' directories.
|
||||
|
|
|
@ -606,27 +606,24 @@ get_os_disk (const char *os_dev)
|
|||
{
|
||||
p = path + 5;
|
||||
|
||||
if (have_devfs ())
|
||||
/* If this is an IDE disk. */
|
||||
if (strncmp ("ide/", p, 4) == 0)
|
||||
{
|
||||
/* If this is an IDE disk. */
|
||||
if (strncmp ("ide/", p, 4) == 0)
|
||||
{
|
||||
p = strstr (p, "part");
|
||||
if (p)
|
||||
strcpy (p, "disc");
|
||||
|
||||
return path;
|
||||
}
|
||||
|
||||
/* If this is a SCSI disk. */
|
||||
if (strncmp ("scsi/", p, 5) == 0)
|
||||
{
|
||||
p = strstr (p, "part");
|
||||
if (p)
|
||||
strcpy (p, "disc");
|
||||
|
||||
return path;
|
||||
}
|
||||
p = strstr (p, "part");
|
||||
if (p)
|
||||
strcpy (p, "disc");
|
||||
|
||||
return path;
|
||||
}
|
||||
|
||||
/* If this is a SCSI disk. */
|
||||
if (strncmp ("scsi/", p, 5) == 0)
|
||||
{
|
||||
p = strstr (p, "part");
|
||||
if (p)
|
||||
strcpy (p, "disc");
|
||||
|
||||
return path;
|
||||
}
|
||||
|
||||
/* If this is a DAC960 disk. */
|
||||
|
|
Loading…
Reference in a new issue