enable CONFIG_BRIDGE=y

diff --git a/Makefile b/Makefile
index c1a1987d641cb82cebe82cea1433979c6100413d..e03f03153fd8a41174f08de2a944197cb8809acd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=2.0
 
 KERNEL_VER=2.6.32
-PKGREL=62
+PKGREL=63
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=10

diff --git a/README b/README
index e567159f1bb0d73311301120ea5f9478dec874f6..94415f9ce82ade26ba30b5d2037cc6e06ba3139c 100644 (file)
--- a/README
+++ b/README
@@ -95,6 +95,11 @@ see config-2.6.32.diff
   This is disabled in RHEL kernel for no real reason, so we enable
   it as requested by users (bug #64)
 
+- enable CONFIG_BRIDGE=y
+
+  Else we get warnings on boot, that
+  net.bridge.bridge-nf-call-iptables is an unknown key
+
 Testing final kernel with kvm
 -----------------------------
 

diff --git a/changelog.Debian b/changelog.Debian
index d748c37f9a4006f61e8748d6319e5450675ed174..051f83f54e26568684dda20aff3222104df513ef 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+pve-kernel-2.6.32 (2.6.32-63) unstable; urgency=low
+
+  * set CONFIG_BRIDGE=y (avoid sysctl warnings)
+  
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 20 Mar 2012 09:11:58 +0100
+
 pve-kernel-2.6.32 (2.6.32-62) unstable; urgency=low
 
   * optimize CFQ scheduler paramemters

diff --git a/config-2.6.32.diff b/config-2.6.32.diff
index b986e9de4ac203301a557b99fb27e27b623a00b7..b3e90f73f5d0c44489de8e721dab9b13aa30510c 100644 (file)
--- a/config-2.6.32.diff
+++ b/config-2.6.32.diff
@@ -1,5 +1,5 @@
 --- config-2.6.32-042stab049.6.x86_64  2012-02-13 07:18:08.000000000 +0100
-+++ config-2.6.32      2012-02-16 08:44:34.000000000 +0100
++++ config-2.6.32      2012-03-20 09:09:34.000000000 +0100
 @@ -103,7 +103,7 @@
  CONFIG_FAIR_GROUP_SCHED=y
  CONFIG_CFS_BANDWIDTH=y
@@ -18,6 +18,15 @@
  # CONFIG_MODULE_SIG_FORCE is not set
  CONFIG_MODULE_VERIFY=y
  CONFIG_STOP_MACHINE=y
+@@ -935,7 +935,7 @@
+ # CONFIG_ATM_BR2684_IPFILTER is not set
+ CONFIG_STP=m
+ CONFIG_GARP=m
+-CONFIG_BRIDGE=m
++CONFIG_BRIDGE=y
+ CONFIG_BRIDGE_IGMP_SNOOPING=y
+ CONFIG_NET_DSA=y
+ CONFIG_NET_DSA_TAG_DSA=y
 @@ -1344,10 +1344,10 @@
  #
  # SCSI support type (disk, tape, CD-ROM)

diff --git a/proxmox-ve/changelog.Debian b/proxmox-ve/changelog.Debian
index 09664496ab6159c196e674e10fc92d5845a6f55b..7cb07cb8f59c3513df9c562ce3bca00bb841c388 100644 (file)
--- a/proxmox-ve/changelog.Debian
+++ b/proxmox-ve/changelog.Debian
@@ -1,4 +1,4 @@
-proxmox-ve-2.6.32 (2.0-62) unstable; urgency=low
+proxmox-ve-2.6.32 (2.0-63) unstable; urgency=low
 
   * re-package to update version number