From: davem <davem@localhost>
Date: Thu, 30 Apr 2009 13:21:14 +0000 (+0000)
Subject: 	* util/hostdisk.c (convert_system_partition_to_system_disk):
X-Git-Tag: 1.98~970
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6966215ddb077b7c2f93a33b53b79dd1f0ce57b2;p=thirdparty%2Fgrub.git

	* util/hostdisk.c (convert_system_partition_to_system_disk):
	Handle virtual disk devices named /dev/vdiskX as found on sparc
	and powerpc.
---

diff --git a/ChangeLog b/ChangeLog
index 4b170990e..d0df5dc68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-04-30  David S. Miller  <davem@davemloft.net>
 
+	* util/hostdisk.c (convert_system_partition_to_system_disk):
+	Handle virtual disk devices named /dev/vdiskX as found on sparc
+	and powerpc.
+
 	* kern/sparc64/ieee1275/init.c (grub_machine_set_prefix): If
 	lettered partition specifier is found, convert to numbered.
 
diff --git a/util/hostdisk.c b/util/hostdisk.c
index aa41703fe..af93f9759 100644
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -767,6 +767,13 @@ convert_system_partition_to_system_disk (const char *os_dev)
 	}
       
       /* If this is an IDE, SCSI or Virtio disk.  */
+      if (strncmp ("vdisk", p, 5) == 0
+	  && p[5] >= 'a' && p[5] <= 'z')
+	{
+	  /* /dev/vdisk[a-z][0-9]* */
+	  p[6] = '\0';
+	  return path;
+	}
       if ((strncmp ("hd", p, 2) == 0
 	   || strncmp ("vd", p, 2) == 0
 	   || strncmp ("sd", p, 2) == 0)