Patchwork Hardy LP#487010 pull request

login
register
mail settings
Submitter Stefan Bader
Date Dec. 9, 2009, 4:13 p.m.
Message ID <4B1FCCBD.7060202@canonical.com>
Download mbox | patch
Permalink /patch/40735/
State Accepted
Headers show

Comments

Stefan Bader - Dec. 9, 2009, 4:13 p.m.
Stefan Bader wrote:
> Tim Gardner wrote:
>> Please pull from git://kernel.ubuntu.com/rtg/ubuntu-hardy lp487010
>>
>> rtg
>>
> NAK, actually I got onto the same thing and also enabled the filter
> modules. Will send patch as soon as it is build and got tested. :-P
> 
> -Stefan
> 
This was what I had in mind.

-Stefan
Tim Gardner - Dec. 9, 2009, 4:29 p.m.
Stefan Bader wrote:
> Stefan Bader wrote:
>> Tim Gardner wrote:
>>> Please pull from git://kernel.ubuntu.com/rtg/ubuntu-hardy lp487010
>>>
>>> rtg
>>>
>> NAK, actually I got onto the same thing and also enabled the filter
>> modules. Will send patch as soon as it is build and got tested. :-P
>>
>> -Stefan
>>
> This was what I had in mind.
> 
> -Stefan
> 

Seems like a good idea. So much for config naming consistency, e.g.,
CONFIG_NF_CONNTRACK_IPV6 v.s. _all_ of the filter modules which are
named *IP6*.

rtg
Stefan Bader - Dec. 9, 2009, 4:33 p.m.
Tim Gardner wrote:
> Stefan Bader wrote:
>> Stefan Bader wrote:
>>> Tim Gardner wrote:
>>>> Please pull from git://kernel.ubuntu.com/rtg/ubuntu-hardy lp487010
>>>>
>>>> rtg
>>>>
>>> NAK, actually I got onto the same thing and also enabled the filter
>>> modules. Will send patch as soon as it is build and got tested. :-P
>>>
>>> -Stefan
>>>
>> This was what I had in mind.
>>
>> -Stefan
>>
> 
> Seems like a good idea. So much for config naming consistency, e.g.,
> CONFIG_NF_CONNTRACK_IPV6 v.s. _all_ of the filter modules which are
> named *IP6*.
> 
> rtg

Ok. So as you were the one winning the assignment race for the Hardy
task, I would use the resulting patch (which currently test builds),
assume it was signed by you, then ACK it by me and wait for someone
else to ACK for final commitment.

-Stefan
Andy Whitcroft - Dec. 9, 2009, 4:42 p.m.
On Wed, Dec 09, 2009 at 05:13:49PM +0100, Stefan Bader wrote:
> From 3a709f5a6767cf272f062b1d0bd6fecd421f8751 Mon Sep 17 00:00:00 2001
> From: Stefan Bader <stefan.bader@canonical.com>
> Date: Wed, 9 Dec 2009 15:37:22 +0000
> Subject: [PATCH] UBUNTU: (config) Enable ipv6 filter modules on virtual flavour
>  BugLink: http://bugs.launchpad.net/bugs/487010
> 
> This makes it the same as for the server configuration.

That looks nice, making the virtual match server, and making them all
common into the bargain.

Acked-by: Andy Whitcroft <apw@canonical.com>

-apw

Patch

From 3a709f5a6767cf272f062b1d0bd6fecd421f8751 Mon Sep 17 00:00:00 2001
From: Stefan Bader <stefan.bader@canonical.com>
Date: Wed, 9 Dec 2009 15:37:22 +0000
Subject: [PATCH] UBUNTU: (config) Enable ipv6 filter modules on virtual flavour
 BugLink: http://bugs.launchpad.net/bugs/487010

This makes it the same as for the server configuration.

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---
 debian/config/i386/config         |   18 ++++++++++++++++++
 debian/config/i386/config.386     |   18 ------------------
 debian/config/i386/config.generic |   18 ------------------
 debian/config/i386/config.server  |   18 ------------------
 debian/config/i386/config.virtual |    3 ---
 5 files changed, 18 insertions(+), 57 deletions(-)

diff --git a/debian/config/i386/config b/debian/config/i386/config
index 67b29b2..f71f9a7 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -513,6 +513,23 @@  CONFIG_IO_DELAY_TYPE_NONE=3
 CONFIG_IO_DELAY_TYPE_UDELAY=2
 # CONFIG_IO_DELAY_UDELAY is not set
 CONFIG_IP1000=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_OWNER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IPDDP=m
 CONFIG_IPDDP_DECAP=y
 CONFIG_IPDDP_ENCAP=y
@@ -823,6 +840,7 @@  CONFIG_NF_CONNTRACK_ENABLED=m
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_PPTP=m
diff --git a/debian/config/i386/config.386 b/debian/config/i386/config.386
index b6161a4..f20dee2 100644
--- a/debian/config/i386/config.386
+++ b/debian/config/i386/config.386
@@ -747,23 +747,6 @@  CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
 # CONFIG_INPUT_YEALINK is not set
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_OWNER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_QUEUE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_LOG=m
-CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IPPP_FILTER=y
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
 CONFIG_IPW2100=m
@@ -1110,7 +1093,6 @@  CONFIG_NEW_LEDS=y
 CONFIG_NFTL=m
 CONFIG_NFTL_RW=y
 CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CT_PROTO_SCTP=m
diff --git a/debian/config/i386/config.generic b/debian/config/i386/config.generic
index ccae931..589f373 100644
--- a/debian/config/i386/config.generic
+++ b/debian/config/i386/config.generic
@@ -745,23 +745,6 @@  CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
 CONFIG_INPUT_YEALINK=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_OWNER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_QUEUE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_LOG=m
-CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IPPP_FILTER=y
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
 CONFIG_IPW2100=m
@@ -1107,7 +1090,6 @@  CONFIG_NEW_LEDS=y
 CONFIG_NFTL=m
 CONFIG_NFTL_RW=y
 CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CT_PROTO_SCTP=m
diff --git a/debian/config/i386/config.server b/debian/config/i386/config.server
index 24f3132..b5033a4 100644
--- a/debian/config/i386/config.server
+++ b/debian/config/i386/config.server
@@ -747,23 +747,6 @@  CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
 CONFIG_INPUT_YEALINK=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_OWNER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_QUEUE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_LOG=m
-CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IPPP_FILTER=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 # CONFIG_IPV6_SUBTREES is not set
@@ -1108,7 +1091,6 @@  CONFIG_NEW_LEDS=y
 CONFIG_NFTL=m
 CONFIG_NFTL_RW=y
 CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CT_PROTO_SCTP=m
diff --git a/debian/config/i386/config.virtual b/debian/config/i386/config.virtual
index 17ac914..8b609f1 100644
--- a/debian/config/i386/config.virtual
+++ b/debian/config/i386/config.virtual
@@ -222,8 +222,6 @@  CONFIG_HZ_250=y
 # CONFIG_INPUT_UINPUT is not set
 # CONFIG_INPUT_WISTRON_BTNS is not set
 # CONFIG_INPUT_YEALINK is not set
-# CONFIG_IP6_NF_IPTABLES is not set
-# CONFIG_IP6_NF_QUEUE is not set
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_IP_NF_TARGET_CLUSTERIP is not set
 # CONFIG_IRDA is not set
@@ -290,7 +288,6 @@  CONFIG_NET_CLS_POLICE=y
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NEW_LEDS is not set
 # CONFIG_NF_CONNTRACK_H323 is not set
-# CONFIG_NF_CONNTRACK_IPV6 is not set
 # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
 # CONFIG_NF_CONNTRACK_SIP is not set
 # CONFIG_NF_CT_PROTO_SCTP is not set
-- 
1.5.4.3