mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-28 07:44:52 +00:00
da63b36ca7
- Rebase to current master - Fix pmtimer calibration to not take forever to fail on kvm. Signed-off-by: Peter Jones <pjones@redhat.com>
39 lines
1 KiB
Diff
39 lines
1 KiB
Diff
From 2be491fd083ab8e155ee1d33f4fc34c3bdeb11fe Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Tue, 30 Jun 2015 15:50:41 -0400
|
|
Subject: [PATCH 165/225] 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 90d92d3ad..6d9f4e5fa 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')
|
|
{
|
|
--
|
|
2.14.3
|
|
|