From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 10 Apr 2014 14:42:41 +0100 Subject: [PATCH] Improve LVM "logical_volumes" string matching * grub-core/disk/lvm.c (grub_lvm_detect): Search for "logical_volumes" block a little more accurately. --- grub-core/disk/lvm.c | 4 ++-- ChangeLog | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c index 483c17eb5f6..862a9664f2c 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) diff --git a/ChangeLog b/ChangeLog index 50d9291624a..7f0c57dc0ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-04-10 Colin Watson + + * grub-core/disk/lvm.c (grub_lvm_detect): Search for + "logical_volumes" block a little more accurately. + 2014-04-06 Vladimir Serbinenko * grub-core/lib/syslinux_parse.c: Fix timeout quoting.