[pve-devel] [PATCH] vznetaddbr perl version

Alexandre Derumier aderumier at odiso.com
Wed Apr 30 14:13:54 CEST 2014


this replace the default vznetaddbr script,
using perl code.

This allow to use vlan tag, firewall bridge and openvswitch bridge
like for qemu

Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
 debian/patches/fix-config-path.diff |   13 -------------
 debian/patches/series               |    2 +-
 debian/rules                        |    3 +++
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/debian/patches/fix-config-path.diff b/debian/patches/fix-config-path.diff
index 8a17ad9..fa50f56 100644
--- a/debian/patches/fix-config-path.diff
+++ b/debian/patches/fix-config-path.diff
@@ -24,19 +24,6 @@ Index: new/paths.am
  distconfdir = $(pkgconfdir)/dists
  namesdir    = $(pkgconfdir)/names
  
-Index: new/bin/vznetaddbr.in
-===================================================================
---- new.orig/bin/vznetaddbr.in	2012-09-28 09:05:45.000000000 +0200
-+++ new/bin/vznetaddbr.in	2012-09-28 09:39:27.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')
 Index: new/etc/init.d/vz-redhat.in
 ===================================================================
 --- new.orig/etc/init.d/vz-redhat.in	2012-09-28 09:05:45.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
index 483ec4c..ed86721 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,5 +7,5 @@ no-backup-on-destroy.diff
 fix-init.d-depends.diff
 allow-abs-ostemplate-path.diff
 always-create-dev-console.patch
-keep-bridge-MTU.patch
+#keep-bridge-MTU.patch
 fix-vzifup-post-error.patch
diff --git a/debian/rules b/debian/rules
index 1a4bc81..c9805fd 100644
--- a/debian/rules
+++ b/debian/rules
@@ -95,6 +95,9 @@ install: build
 	rm -rf $(CURDIR)/debian/vzctl/etc/vz/conf
 	# we create the symlink to /etc/pve/openvz inside the preinst script
 
+	# install perl vznetaddbr version
+	install -m 644 $(CURDIR)/debian/vznetaddbr $(CURDIR)/debian/vzctl/usr/sbin/vznetaddbr
+
 
 
 # Build architecture-independent files here.
-- 
1.7.10.4



More information about the pve-devel mailing list