mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 14:32:58 +00:00
46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
|
From d576e05a7bfe25413f70b54f671f305397bacf5e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Colin Watson <cjwatson@ubuntu.com>
|
||
|
|
Date: Thu, 10 Apr 2014 14:42:41 +0100
|
||
|
|
Subject: [PATCH 077/125] Improve LVM "logical_volumes" string matching
|
||
|
|
|
||
|
|
* grub-core/disk/lvm.c (grub_lvm_detect): Search for
|
||
|
|
"logical_volumes" block a little more accurately.
|
||
|
|
---
|
||
|
|
ChangeLog | 5 +++++
|
||
|
|
grub-core/disk/lvm.c | 4 ++--
|
||
|
|
2 files changed, 7 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/ChangeLog b/ChangeLog
|
||
|
|
index 50d9291..7f0c57d 100644
|
||
|
|
--- a/ChangeLog
|
||
|
|
+++ b/ChangeLog
|
||
|
|
@@ -1,3 +1,8 @@
|
||
|
|
+2014-04-10 Colin Watson <cjwatson@ubuntu.com>
|
||
|
|
+
|
||
|
|
+ * grub-core/disk/lvm.c (grub_lvm_detect): Search for
|
||
|
|
+ "logical_volumes" block a little more accurately.
|
||
|
|
+
|
||
|
|
2014-04-06 Vladimir Serbinenko <phcoder@gmail.com>
|
||
|
|
|
||
|
|
* grub-core/lib/syslinux_parse.c: Fix timeout quoting.
|
||
|
|
diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
|
||
|
|
index 483c17e..862a966 100644
|
||
|
|
--- a/grub-core/disk/lvm.c
|
||
|
|
+++ b/grub-core/disk/lvm.c
|
||
|
|
@@ -333,10 +333,10 @@ grub_lvm_detect (grub_disk_t disk,
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
- p = grub_strstr (p, "logical_volumes");
|
||
|
|
+ p = grub_strstr (p, "logical_volumes {");
|
||
|
|
if (p)
|
||
|
|
{
|
||
|
|
- p += sizeof ("logical_volumes = ") - 1;
|
||
|
|
+ p += sizeof ("logical_volumes {") - 1;
|
||
|
|
|
||
|
|
/* And add all the lvs to the volume group. */
|
||
|
|
while (1)
|
||
|
|
--
|
||
|
|
1.9.0
|
||
|
|
|