From: robertmh <robertmh@localhost>
Date: Sat, 5 Jan 2008 12:02:03 +0000 (+0000)
Subject: 2008-01-05  Robert Millan  <rmh@aybabtu.com>
X-Git-Tag: 1.98~1732
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddf8f6add7cc1d654ca153d10e2c637977292088;p=thirdparty%2Fgrub.git

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 a16d393f0..7e9d7ee35 100644
--- 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 0099972b9..ee9041f3d 100644
--- 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.  */