From 60e2744bd4b89272fd0ad1b24bf67ca00e69abb8 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Sun, 20 Mar 2016 13:35:17 +0000 Subject: [PATCH] UBUNTU: [Config] disable CONFIG_IP_PNP This support is completely duplicated in the initramfs code. As things stand we attempt this PNP when we do not have the devices we could use loaded and will not be able to load until the initramfs is loaded. Therefore disable this support in the kernel and rely on the initramfs-tools code. BugLink: http://bugs.launchpad.net/bugs/1259861 Signed-off-by: Andy Whitcroft --- debian.master/config/annotations | 7 +++---- debian.master/config/config.common.ubuntu | 5 +---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 21949c86b793..7f4770d531cb 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -8906,10 +8906,9 @@ CONFIG_IP_ROUTE_MULTIPATH policy<{'amd64': 'y', 'arm64': ' CONFIG_IP_ROUTE_VERBOSE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}> # Menu: Networking support >> Networking options >> TCP/IP networking >> IP: kernel level autoconfiguration -CONFIG_IP_PNP policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}> -CONFIG_IP_PNP_DHCP policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}> -CONFIG_IP_PNP_BOOTP policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}> -CONFIG_IP_PNP_RARP policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}> +CONFIG_IP_PNP policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}> +# +CONFIG_IP_PNP note # Menu: Networking support >> Networking options >> TCP/IP networking >> IP: multicast routing CONFIG_IP_MROUTE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index ffb50e6831f1..3003c6e4e5df 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3725,10 +3725,7 @@ CONFIG_IP_NF_TARGET_SYNPROXY=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y -CONFIG_IP_PNP=y -# CONFIG_IP_PNP_BOOTP is not set -CONFIG_IP_PNP_DHCP=y -# CONFIG_IP_PNP_RARP is not set +# CONFIG_IP_PNP is not set CONFIG_IP_ROUTE_CLASSID=y CONFIG_IP_ROUTE_MULTIPATH=y CONFIG_IP_ROUTE_VERBOSE=y -- 2.39.5