fix config path in vznetaddbr

diff --git a/Makefile b/Makefile
index f6e5a4e2bf7218c3bec84a398773ae4de408c6b7..7daefe35dc80f40eaf3876b6e6d1fad4a2176198 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=2.0
 
 SVER=3.0.29
-PACKAGERELEASE=3pve1
+PACKAGERELEASE=3pve2
 ARCH=amd64
 
 PACKAGE=vzctl

diff --git a/debian/changelog b/debian/changelog
index 79357aac8e64d58d0f129a782269c136f0ce49bc..3492d2eb5e83326925b00d0fd314ce48e6cfdaa9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vzctl (3.0.29-3pve2) unstable; urgency=low
+
+  * fix config path in vznetaddbr
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 05 Oct 2011 09:09:50 +0200
+
 vzctl (3.0.29-3pve1) unstable; urgency=low
 
   * update to 3.0.29.3

diff --git a/debian/patches/fix-vznetaddbr-conf-path.diff b/debian/patches/fix-vznetaddbr-conf-path.diff
new file mode 100644 (file)
index 0000000..e522776
--- /dev/null
+++ b/debian/patches/fix-vznetaddbr-conf-path.diff
@@ -0,0 +1,13 @@
+Index: new/bin/vznetaddbr.in
+===================================================================
+--- new.orig/bin/vznetaddbr.in 2011-10-05 09:03:07.000000000 +0200
++++ new/bin/vznetaddbr.in      2011-10-05 09:04:15.000000000 +0200
+@@ -2,7 +2,7 @@
+ #
+ # Add virtual network interfaces (veth's) in a container to a bridge on CT0
+ 
+-CONFIGFILE=@PKGCONFDIR@/conf/$VEID.conf
++CONFIGFILE=@VPSCONFDIR@/$VEID.conf
+ . $CONFIGFILE
+ 
+ NETIFLIST=$(printf %s "$NETIF" |tr ';' '\n')

diff --git a/debian/patches/series b/debian/patches/series
index c23c7df6877ec117d41d0beb83773a888d9e8154..9714fe7a6abf48500a7351dd68c4789cf624e488 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ fix-vzevent-init.patch
 fix-default-template.diff
 fix-udev-path.diff
 fix-config-path.diff
+fix-vznetaddbr-conf-path.diff