* util/getroot.c (convert_system_partition_to_system_disk); Add etherd

	names.
	Reported by: Bastian Blank.

diff --git a/ChangeLog b/ChangeLog
index c379e47fe14113c9ae0b4c1410e4ff71cff90fe5..0c0270188116c77ed669246aeefd7f6a5d908521 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/getroot.c (convert_system_partition_to_system_disk); Add etherd
+       names.
+       Reported by: Bastian Blank.
+
 2012-05-03  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/fs/btrfs.c (grub_btrfs_lzo_decompress): Fix offset when

diff --git a/util/getroot.c b/util/getroot.c
index 3955f00374f3767fd59c7132d22dc532a11f410a..4a7e57648bd930d4cc7077f86e4d4c1708eeab0d 100644 (file)
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -1740,6 +1740,20 @@ convert_system_partition_to_system_disk (const char *os_dev, struct stat *st,
          return path;
        }
 
+      /* If this is an AOE disk.  */
+      if (strncmp ("etherd/e", p, sizeof ("etherd/e") - 1) == 0)
+       {
+         /* /dev/etherd/e[0-9]+\.[0-9]+(p[0-9]+)? */
+         p = strchr (p, 'p');
+         if (p)
+           {
+             *is_part = 1;
+             *p = '\0';
+           }
+
+         return path;
+       }
+
       /* If this is a Compaq Intelligent Drive Array.  */
       if (strncmp ("ida/c", p, sizeof ("ida/c") - 1) == 0)
        {