2016-08-25 18:42:57 +00:00
|
|
|
From 90e2d3fbb161d494cdfc0ad0da740a6a4f651d70 Mon Sep 17 00:00:00 2001
|
2016-04-05 19:28:47 +00:00
|
|
|
From: Peter Jones <pjones@redhat.com>
|
|
|
|
Date: Tue, 30 Jun 2015 15:50:41 -0400
|
2016-08-25 18:42:57 +00:00
|
|
|
Subject: [PATCH 79/87] Handle rssd storage devices.
|
2016-04-05 19:28:47 +00:00
|
|
|
|
|
|
|
Resolves: rhbz#1087962
|
|
|
|
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
|
---
|
|
|
|
grub-core/osdep/linux/getroot.c | 13 +++++++++++++
|
|
|
|
1 file changed, 13 insertions(+)
|
|
|
|
|
|
|
|
diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
|
2016-08-25 18:42:57 +00:00
|
|
|
index 09e7e6e..ad7b774 100644
|
2016-04-05 19:28:47 +00:00
|
|
|
--- a/grub-core/osdep/linux/getroot.c
|
|
|
|
+++ b/grub-core/osdep/linux/getroot.c
|
2016-08-25 18:42:57 +00:00
|
|
|
@@ -898,6 +898,19 @@ grub_util_part_to_disk (const char *os_dev, struct stat *st,
|
2016-04-05 19:28:47 +00:00
|
|
|
return path;
|
|
|
|
}
|
|
|
|
|
|
|
|
+ /* If this is an rssd device. */
|
|
|
|
+ if ((strncmp ("rssd", p, 4) == 0) && p[4] >= 'a' && p[4] <= 'z')
|
|
|
|
+ {
|
|
|
|
+ char *pp = p + 4;
|
|
|
|
+ while (*pp >= 'a' && *pp <= 'z')
|
|
|
|
+ pp++;
|
|
|
|
+ if (*pp)
|
|
|
|
+ *is_part = 1;
|
|
|
|
+ /* /dev/rssd[a-z]+[0-9]* */
|
|
|
|
+ *pp = '\0';
|
|
|
|
+ return path;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
/* If this is a loop device */
|
|
|
|
if ((strncmp ("loop", p, 4) == 0) && p[4] >= '0' && p[4] <= '9')
|
|
|
|
{
|
|
|
|
--
|
2016-08-25 18:42:57 +00:00
|
|
|
2.7.4
|
2016-04-05 19:28:47 +00:00
|
|
|
|