From 6f132b4ccd2e536f42fb6b01dcaade06dd6db87d Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Fri, 4 Oct 2013 09:21:50 +0200
Subject: [PATCH] fix bug #461: keep bridge MTU

---
 Makefile                             |  2 +-
 debian/changelog                     |  6 ++++++
 debian/patches/keep-bridge-MTU.patch | 20 ++++++++++++++++++++
 debian/patches/series                |  1 +
 4 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/keep-bridge-MTU.patch

diff --git a/Makefile b/Makefile
index eb3799f..8739b11 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=3.0
 
 SVER=4.0
-PACKAGERELEASE=1pve3
+PACKAGERELEASE=1pve4
 ARCH=amd64
 
 PACKAGE=vzctl
diff --git a/debian/changelog b/debian/changelog
index 3e7b8aa..5e57bfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vzctl (4.0-1pve4) unstable; urgency=low
+
+  * fix bug #461: keep bridge MTU
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 04 Oct 2013 08:51:14 +0200
+
 vzctl (4.0-1pve3) unstable; urgency=low
 
   * increase version for wheezy
diff --git a/debian/patches/keep-bridge-MTU.patch b/debian/patches/keep-bridge-MTU.patch
new file mode 100644
index 0000000..7a3fe16
--- /dev/null
+++ b/debian/patches/keep-bridge-MTU.patch
@@ -0,0 +1,20 @@
+Index: new/bin/vznetaddbr.in
+===================================================================
+--- new.orig/bin/vznetaddbr.in	2013-10-04 09:09:45.000000000 +0200
++++ new/bin/vznetaddbr.in	2013-10-04 09:21:04.000000000 +0200
+@@ -29,8 +29,14 @@
+     [ -n "$bridge" ] ||
+ 	bridge=vmbr0
+ 
++    if [ ! -f "/sys/class/net/$bridge/mtu" ]; then
++	echo >&2 "bridge $bridge does not exists."
++	exit 1
++    fi
++
+     echo "Adding interface $host_ifname to bridge $bridge on CT0 for CT$VEID"
+-    ip link set dev "$host_ifname" up
++    bridge_mtu=$(cat "/sys/class/net/$bridge/mtu")
++    ip link set dev "$host_ifname" up mtu "$bridge_mtu"
+     ip addr add 0.0.0.0/0 dev "$host_ifname"
+     echo 1 >"/proc/sys/net/ipv4/conf/$host_ifname/proxy_arp"
+     echo 1 >"/proc/sys/net/ipv4/conf/$host_ifname/forwarding"
diff --git a/debian/patches/series b/debian/patches/series
index 0e3c1c9..fda139c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ no-backup-on-destroy.diff
 fix-init.d-depends.diff
 allow-abs-ostemplate-path.diff
 always-create-dev-console.patch
+keep-bridge-MTU.patch
-- 
2.39.2