From 2c0fe19a5c7c47f70941352c5065a6f115b0ee24 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 20 Mar 2012 09:14:49 +0100 Subject: [PATCH] enable CONFIG_BRIDGE=y --- Makefile | 2 +- README | 5 +++++ changelog.Debian | 6 ++++++ config-2.6.32.diff | 11 ++++++++++- proxmox-ve/changelog.Debian | 2 +- 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c1a1987..e03f031 100644 --- 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 e567159..94415f9 100644 --- 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 d748c37..051f83f 100644 --- 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 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 b986e9d..b3e90f7 100644 --- 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 0966449..7cb07cb 100644 --- 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 -- 2.39.5