|
 |
f725e3 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
f725e3 |
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f725e3 |
Date: Thu, 3 Apr 2014 21:31:12 +0200
|
|
|
f725e3 |
Subject: [PATCH] * grub-core/osdep/linux/getroot.c (grub_util_part_to_disk):
|
|
|
f725e3 |
Support NVMe device names.
|
|
|
f725e3 |
|
|
|
f725e3 |
---
|
|
|
f725e3 |
grub-core/osdep/linux/getroot.c | 17 +++++++++++++++++
|
|
|
f725e3 |
ChangeLog | 5 +++++
|
|
|
f725e3 |
2 files changed, 22 insertions(+)
|
|
|
f725e3 |
|
|
|
f725e3 |
diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
|
|
|
f725e3 |
index 19581d32997..7007193d9c7 100644
|
|
|
f725e3 |
--- a/grub-core/osdep/linux/getroot.c
|
|
|
f725e3 |
+++ b/grub-core/osdep/linux/getroot.c
|
|
|
f725e3 |
@@ -896,6 +896,23 @@ grub_util_part_to_disk (const char *os_dev, struct stat *st,
|
|
|
f725e3 |
*pp = '\0';
|
|
|
f725e3 |
return path;
|
|
|
f725e3 |
}
|
|
|
f725e3 |
+
|
|
|
f725e3 |
+ /* If this is a NVMe device */
|
|
|
f725e3 |
+ if ((strncmp ("nvme", p, 4) == 0) && p[4] >= '0' && p[4] <= '9')
|
|
|
f725e3 |
+ {
|
|
|
f725e3 |
+ char *pp = p + 4;
|
|
|
f725e3 |
+ while (*pp >= '0' && *pp <= '9')
|
|
|
f725e3 |
+ pp++;
|
|
|
f725e3 |
+ if (*pp == 'n')
|
|
|
f725e3 |
+ pp++;
|
|
|
f725e3 |
+ while (*pp >= '0' && *pp <= '9')
|
|
|
f725e3 |
+ pp++;
|
|
|
f725e3 |
+ if (*pp == 'p')
|
|
|
f725e3 |
+ *is_part = 1;
|
|
|
f725e3 |
+ /* /dev/nvme[0-9]+n[0-9]+p[0-9]* */
|
|
|
f725e3 |
+ *pp = '\0';
|
|
|
f725e3 |
+ return path;
|
|
|
f725e3 |
+ }
|
|
|
f725e3 |
}
|
|
|
f725e3 |
|
|
|
f725e3 |
return path;
|
|
|
f725e3 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
f725e3 |
index accffade86b..4a484092a6f 100644
|
|
|
f725e3 |
--- a/ChangeLog
|
|
|
f725e3 |
+++ b/ChangeLog
|
|
|
f725e3 |
@@ -1,3 +1,8 @@
|
|
|
f725e3 |
+2014-04-03 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f725e3 |
+
|
|
|
f725e3 |
+ * grub-core/osdep/linux/getroot.c (grub_util_part_to_disk): Support NVMe
|
|
|
f725e3 |
+ device names.
|
|
|
f725e3 |
+
|
|
|
f725e3 |
2014-03-31 Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
|
|
|
f725e3 |
|
|
|
f725e3 |
btrfs: fix get_root key comparison failures due to endianness
|