do not change paths in vzmigrate - we do not use that tool

That way users can use that tool to migrate to machines outside the pve cluster

diff --git a/Makefile b/Makefile
index 9196e0ea56aaa126484757b7ea054a293c442461..8e677c2738ebbbb444e7b59a052407e8d05131ff 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=2.0
 
 SVER=3.0.29
-PACKAGERELEASE=3pve5
+PACKAGERELEASE=3pve6
 ARCH=amd64
 
 PACKAGE=vzctl

diff --git a/debian/changelog b/debian/changelog
index 17630212c5ba8d06154aa4d417cb38a0127fa9f6..4e1f41a69926f9c7f60c64d0adace26bee54c5b6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vzctl (3.0.29-3pve6) unstable; urgency=low
+
+  * do not change paths in vzmigrate - we do not use that tool
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 08 Dec 2011 11:46:06 +0100
+
 vzctl (3.0.29-3pve5) unstable; urgency=low
 
   * add pve-cluster dependency in /etc/init.d/vz 

diff --git a/debian/patches/fix-config-path.diff b/debian/patches/fix-config-path.diff
index 198ba87c1cc761b0388abe98b3caaa0c5cfbf1fe..1e73b9b847199621fc4b095a0a7a8c9ebbceebf2 100644 (file)
--- a/debian/patches/fix-config-path.diff
+++ b/debian/patches/fix-config-path.diff
@@ -37,19 +37,6 @@ Index: new/bin/vznetaddbr.in
  . $CONFIGFILE
  
  NETIFLIST=$(printf %s "$NETIF" |tr ';' '\n')
-Index: new/bin/vzmigrate.in
-===================================================================
---- new.orig/bin/vzmigrate.in  2011-11-17 08:02:47.000000000 +0100
-+++ new/bin/vzmigrate.in       2011-11-17 08:05:45.000000000 +0100
-@@ -31,7 +31,7 @@
- remove_area=1
- keep_dst=0
- debug=0
--confdir="@PKGCONFDIR@/conf"
-+confdir="@VPSCONFDIR@"
- vzconf="@PKGCONFDIR@/vz.conf"
- tmpdir="/var/tmp"
- act_scripts=
 Index: new/etc/init.d/vz-redhat.in
 ===================================================================
 --- new.orig/etc/init.d/vz-redhat.in   2011-11-17 08:06:26.000000000 +0100