* grub-core/osdep/linux/getroot.c (grub_util_part_to_disk): Support NVMe device names.

diff --git a/ChangeLog b/ChangeLog
index 6eca73e35684b41092a906290a2507b8aa87e463..20a3661880f381ec9433cfe72c9f814e09084303 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/osdep/linux/getroot.c (grub_util_part_to_disk): Support NVMe
+       device names.
+
 2014-03-31  Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
 
        btrfs: fix get_root key comparison failures due to endianness

diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
index 19581d32997e1edfbc3b6dbd349b495b8e861c18..7007193d9c787ea621395089378c5227e8cfa139 100644 (file)
--- a/grub-core/osdep/linux/getroot.c
+++ b/grub-core/osdep/linux/getroot.c
@@ -896,6 +896,23 @@ grub_util_part_to_disk (const char *os_dev, struct stat *st,
          *pp = '\0';
          return path;
        }
+
+      /* If this is a NVMe device */
+      if ((strncmp ("nvme", p, 4) == 0) && p[4] >= '0' && p[4] <= '9')
+       {
+         char *pp = p + 4;
+         while (*pp >= '0' && *pp <= '9')
+           pp++;
+         if (*pp == 'n')
+           pp++;
+         while (*pp >= '0' && *pp <= '9')
+           pp++;
+         if (*pp == 'p')
+           *is_part = 1;
+         /* /dev/nvme[0-9]+n[0-9]+p[0-9]* */
+         *pp = '\0';
+         return path;
+       }
     }
 
   return path;