Improve LVM "logical_volumes" string matching

* grub-core/disk/lvm.c (grub_lvm_detect): Search for
"logical_volumes" block a little more accurately.

diff --git a/ChangeLog b/ChangeLog
index 11de908..c98e0df 100644 (file)
--- 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 (file)
--- 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)