summaryrefslogtreecommitdiffstats
path: root/tools/vgmerge.c
diff options
context:
space:
mode:
authorAlasdair Kergon <agk@redhat.com>2006-08-25 23:02:33 +0000
committerAlasdair Kergon <agk@redhat.com>2006-08-25 23:02:33 +0000
commit08c060cf381b2b8ee5a54d84322cb373a5b2fa6b (patch)
tree4a5e06607b7acc950bc589844f5e7fc6e4dbb65f /tools/vgmerge.c
parentb499b916cac3d83b819e2a50709cd5588e91ae1d (diff)
downloadlvm2-08c060cf381b2b8ee5a54d84322cb373a5b2fa6b.tar.gz
lvm2-08c060cf381b2b8ee5a54d84322cb373a5b2fa6b.tar.xz
lvm2-08c060cf381b2b8ee5a54d84322cb373a5b2fa6b.zip
Add skip_dev_dir() to process command line VGs.
Diffstat (limited to 'tools/vgmerge.c')
-rw-r--r--tools/vgmerge.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/vgmerge.c b/tools/vgmerge.c
index 2331bb98..73b7fa81 100644
--- a/tools/vgmerge.c
+++ b/tools/vgmerge.c
@@ -231,7 +231,7 @@ static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to,
int vgmerge(struct cmd_context *cmd, int argc, char **argv)
{
- char *vg_name_to;
+ char *vg_name_to, *vg_name_from;
int opt = 0;
int ret = 0, ret_max = 0;
@@ -240,12 +240,14 @@ int vgmerge(struct cmd_context *cmd, int argc, char **argv)
return EINVALID_CMD_LINE;
}
- vg_name_to = argv[0];
+ vg_name_to = skip_dev_dir(cmd, argv[0]);
argc--;
argv++;
for (; opt < argc; opt++) {
- ret = _vgmerge_single(cmd, vg_name_to, argv[opt]);
+ vg_name_from = skip_dev_dir(cmd, argv[opt]);
+
+ ret = _vgmerge_single(cmd, vg_name_to, vg_name_from);
if (ret > ret_max)
ret_max = ret;
}