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.

diff --git a/ChangeLog b/ChangeLog
index a16d393f0cc68cd6fab65cd663b67c44603bc429..7e9d7ee35ccbb045b833ee05a3d33b2c7fdcb6f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/util/biosdisk.c b/util/biosdisk.c
index 0099972b9165ede47bcbb66ae5acff3e5440c119..ee9041f3d29a796c999e107e9965b9bdb59fb680 100644 (file)
--- a/util/biosdisk.c
+++ b/util/biosdisk.c
@@ -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.  */