+2006-10-18 Jeroen Dekkers <jeroen@dekkers.cx>
+
+ * disk/lvm.c: Rename VGS to VG_LIST.
+ (grub_lvm_iterate): Change VGS->LV to VG-LV.
+ (grub_lvm_open): Likewise.
+ Thanks to Michael Guntsche for finding this bug.
+
2006-10-15 Yoshinori K. Okuji <okuji@enbug.org>
* configure.ac (AC_INIT): Bumped to 1.95.
Hollis Blanchard <hollis@penguinppc.org>
Jeroen Dekkers <jeroen@dekkers.cx>
Johan Rydberg <jrydberg@gnu.org>
-Marco Gerards <metgerards@student.han.nl>
+Marco Gerards <marco@gnu.org>
+Michael Guntsche <mike@it-loops.com>
NIIBE Yutaka <gniibe@m17n.org>
Omniflux <omniflux@omniflux.com>
Robert Bihlmeyer <robbe@orcus.priv.at>
#include <grub/misc.h>
#include <grub/lvm.h>
-static struct grub_lvm_vg *vgs;
+static struct grub_lvm_vg *vg_list;
static int lv_count;
\f
grub_lvm_iterate (int (*hook) (const char *name))
{
struct grub_lvm_vg *vg;
- for (vg = vgs; vg; vg = vg->next)
+ for (vg = vg_list; vg; vg = vg->next)
{
struct grub_lvm_lv *lv;
- for (lv = vgs->lvs; lv; lv = lv->next)
+ for (lv = vg->lvs; lv; lv = lv->next)
if (hook (lv->name))
return 1;
}
{
struct grub_lvm_vg *vg;
struct grub_lvm_lv *lv = NULL;
- for (vg = vgs; vg; vg = vg->next)
+ for (vg = vg_list; vg; vg = vg->next)
{
- for (lv = vgs->lvs; lv; lv = lv->next)
+ for (lv = vg->lvs; lv; lv = lv->next)
if (! grub_strcmp (lv->name, name))
break;
grub_memcpy (vg_id, p, GRUB_LVM_ID_STRLEN);
vg_id[GRUB_LVM_ID_STRLEN] = '\0';
- for (vg = vgs; vg; vg = vg->next)
+ for (vg = vg_list; vg; vg = vg->next)
{
if (! grub_memcmp(vg_id, vg->id, GRUB_LVM_ID_STRLEN))
break;
vg->lvs = NULL;
vg->pvs = NULL;
- vg->next = vgs;
- vgs = vg;
+ vg->next = vg_list;
+ vg_list = vg;
p = grub_strstr (p, "physical_volumes {")
+ sizeof ("physical_volumes {") - 1;