7e98da058f
This change reorganizes and cleanups our patches to reduce the patch number from 314 patches to 187. That's achieved by dropping patches that are later reverted and squashing fixes for earlier patches that introduced features. There are no code changes and the diff with upstream is the same before and after the cleanup. Having fewer patches makes easier to manage the patchset and also will ease to rebase them on top of the latest grub-2.04 release. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
37 lines
1.0 KiB
Diff
37 lines
1.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Tue, 30 Jun 2015 15:50:41 -0400
|
|
Subject: [PATCH] Handle rssd storage devices.
|
|
|
|
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
|
|
index 90d92d3ad5c..6d9f4e5faa2 100644
|
|
--- a/grub-core/osdep/linux/getroot.c
|
|
+++ b/grub-core/osdep/linux/getroot.c
|
|
@@ -921,6 +921,19 @@ grub_util_part_to_disk (const char *os_dev, struct stat *st,
|
|
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')
|
|
{
|