fix for pvecm add: avoid ambiguous options

diff --git a/Makefile b/Makefile
index 4fa4bef064931a0661558d7acff2405bd2ce1eb3..9a03ed7ad344dc65cb893f2fb41e0e8615879998 100644 (file)
--- 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 f0c4f6689f26c3a2135b31633f55ceb597bb0424..d0d2d3f7bca7aa5b6f16bfb088f2b545ff720419 100755 (executable)
--- 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 9d4bcafa0399d7bdadbba86052b32e2bd5d43d9b..0a8b1c9803c61a18f465c9d389f9a835a9e77ab1 100644 (file)
--- 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)