From 187381a9a2d6a3e24e691576eff6bd4d1c8e851e Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@redhat.com>
Date: Mon, 29 Oct 2001 15:28:00 +0000
Subject: [PATCH] prefix & vgname in lvname
---
lib/format1/import-export.c | 7 ++++---
tools/lvm.c | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/format1/import-export.c b/lib/format1/import-export.c
index 27c065df9..9c92403b0 100644
--- a/lib/format1/import-export.c
+++ b/lib/format1/import-export.c
@@ -274,9 +274,10 @@ void export_lv(struct lv_disk *lvd, struct volume_group *vg,
struct logical_volume *lv, const char *prefix)
{
memset(lvd, 0, sizeof(*lvd));
- snprintf(lvd->lv_name, sizeof(lvd->lv_name), "%s/%s",
- prefix, lv->name);
+ snprintf(lvd->lv_name, sizeof(lvd->lv_name), "%s%s/%s",
+ prefix, vg->name, lv->name);
+ /* FIXME: Add 'if' test */
_check_vg_name(vg->name);
strcpy(lvd->vg_name, vg->name);
@@ -406,7 +407,7 @@ static struct logical_volume *_add_lv(struct pool *mem,
struct volume_group *vg,
struct lv_disk *lvd)
{
- struct lv_list *ll = pool_alloc(mem, sizeof(*ll));
+ struct lv_list *ll = pool_zalloc(mem, sizeof(*ll));
struct logical_volume *lv;
if (!ll) {
diff --git a/tools/lvm.c b/tools/lvm.c
index 5ab547ec2..20ff71644 100644
--- a/tools/lvm.c
+++ b/tools/lvm.c
@@ -680,7 +680,7 @@ static int init(void)
struct stat info;
struct pool *ios_pool;
- /* FIXME: Override from config file */
+ /* FIXME: Override from config file. (Append trailing slash if reqd)*/
char *prefix = "/dev/";
if (!(_cf = create_config_file())) {