vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Improve LVM "logical_volumes" string matching

Browse source 
* grub-core/disk/lvm.c (grub_lvm_detect): Search for
"logical_volumes" block a little more accurately.
This commit is contained in:
Colin Watson 2014-04-10 14:42:41 +01:00
parent a72fc329eb
commit c4badfe836
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2014-04-06 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/syslinux_parse.c: Fix timeout quoting. * grub-core/lib/syslinux_parse.c: Fix timeout quoting.

4
grub-core/disk/lvm.c
View file

@ -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) if (p)
{ {
p += sizeof ("logical_volumes = ") - 1; p += sizeof ("logical_volumes {") - 1;
/* And add all the lvs to the volume group. */ /* And add all the lvs to the volume group. */
while (1) while (1)