Jaunty config changes: Build in IPV6

[Andy Whitcroft]

On Mon, Dec 22, 2008 at 04:40:35PM -0700, Tim Gardner wrote:
> From 28e59afea91be392f1cc7d03b7a9d08b0efd0ee9 Mon Sep 17 00:00:00 2001
> From: Tim Gardner <tim.gardner at canonical.com>
> Date: Mon, 22 Dec 2008 15:58:29 -0700
> Subject: [PATCH] UBUNTU: Build in IPV6
> 
> Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
> ---
>  debian/config/amd64/config       |    2 +-
>  debian/config/i386/config        |    2 +-
>  debian/d-i/exclude-modules.armel |    1 -
>  debian/d-i/modules/ipv6-modules  |    1 -
>  debian/d-i/package-list          |    5 -----
>  5 files changed, 2 insertions(+), 9 deletions(-)
>  delete mode 100644 debian/d-i/modules/ipv6-modules
> 
> diff --git a/debian/config/amd64/config b/debian/config/amd64/config
> index 282e29a..3e4f76e 100644
> --- a/debian/config/amd64/config
> +++ b/debian/config/amd64/config
> @@ -1331,7 +1331,7 @@ CONFIG_IPMI_POWEROFF=m
>  CONFIG_IPMI_SI=m
>  CONFIG_IPMI_WATCHDOG=m
>  CONFIG_IPPP_FILTER=y
> -CONFIG_IPV6=m
> +CONFIG_IPV6=y
>  # CONFIG_IPV6_MIP6 is not set
>  # CONFIG_IPV6_MROUTE is not set
>  CONFIG_IPV6_MULTIPLE_TABLES=y
> diff --git a/debian/config/i386/config b/debian/config/i386/config
> index 2ebbcd3..b76bed1 100644
> --- a/debian/config/i386/config
> +++ b/debian/config/i386/config
> @@ -1404,7 +1404,7 @@ CONFIG_IPMI_POWEROFF=m
>  CONFIG_IPMI_SI=m
>  CONFIG_IPMI_WATCHDOG=m
>  CONFIG_IPPP_FILTER=y
> -CONFIG_IPV6=m
> +CONFIG_IPV6=y
>  # CONFIG_IPV6_MIP6 is not set
>  # CONFIG_IPV6_MROUTE is not set
>  CONFIG_IPV6_MULTIPLE_TABLES=y
> diff --git a/debian/d-i/exclude-modules.armel b/debian/d-i/exclude-modules.armel
> index 6901006..0753d39 100644
> --- a/debian/d-i/exclude-modules.armel
> +++ b/debian/d-i/exclude-modules.armel
> @@ -7,7 +7,6 @@ fb-modules
>  firewire-core-modules
>  floppy-modules
>  input-modules
> -ipv6-modules
>  irda-modules
>  md-modules
>  message-modules
> diff --git a/debian/d-i/modules/ipv6-modules b/debian/d-i/modules/ipv6-modules
> deleted file mode 100644
> index 13ac34b..0000000
> --- a/debian/d-i/modules/ipv6-modules
> +++ /dev/null
> @@ -1 +0,0 @@
> -ipv6
> diff --git a/debian/d-i/package-list b/debian/d-i/package-list
> index 43fd23a..b156157 100644
> --- a/debian/d-i/package-list
> +++ b/debian/d-i/package-list
> @@ -43,11 +43,6 @@ Depends: kernel-image, usb-modules
>  Priority: standard
>  Description: Support for various input methods
>  
> -Package: ipv6-modules
> -Depends: kernel-image
> -Priority: standard
> -Description: Support for IPv6 networking
> -
>  Package: irda-modules
>  Depends: kernel-image, nic-shared-modules
>  Priority: standard

Looks sane.  Especially given we always probe ipv6 as soon as any
networking is used.

-apw