From 849bf59f7631a5b4d18859c010afee9b73941102 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 22 Feb 2012 11:08:03 +0100
Subject: [PATCH] fix for pvecm add: avoid ambiguous options

---
 Makefile         | 2 +-
 data/PVE/pvecm   | 4 ++--
 debian/changelog | 6 ++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 4fa4bef..9a03ed7 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.0
 
 PACKAGE=pve-cluster
 PKGVER=1.0
-PKGREL=22
+PKGREL=23
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
diff --git a/data/PVE/pvecm b/data/PVE/pvecm
index f0c4f66..d0d2d3f 100755
--- a/data/PVE/pvecm
+++ b/data/PVE/pvecm
@@ -400,9 +400,9 @@ __PACKAGE__->register_method ({
 	$cmd = ['ssh', $host, '-o', 'BatchMode=yes',
 		'pvecm', 'addnode', $nodename, '--force', 1];
 
-	push @$cmd, '-n', $param->{nodeid} if $param->{nodeid};
+	push @$cmd, '--nodeid', $param->{nodeid} if $param->{nodeid};
 
-	push @$cmd, '-v', $param->{votes} if defined($param->{votes});
+	push @$cmd, '--votes', $param->{votes} if defined($param->{votes});
 
 	if (system (@$cmd) != 0) {
 	    my $cmdtxt = join (' ', @$cmd);
diff --git a/debian/changelog b/debian/changelog
index 9d4bcaf..0a8b1c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pve-cluster (1.0-23) unstable; urgency=low
+
+  * fix for pvecm add: avoid ambiguous options
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 22 Feb 2012 11:07:23 +0100
+
 pve-cluster (1.0-22) unstable; urgency=low
 
   * depend on insserv (we need dependency based boot)
-- 
2.39.5