diff mbox

[5/5] UBUNTU: [Config] Sync IPsec config options

Message ID 1403911438-32720-6-git-send-email-tyhicks@canonical.com
State New
Headers show

Commit Message

Tyler Hicks June 27, 2014, 11:23 p.m. UTC 
Sync with the traditional Ubuntu kernel config options in regards to
ipsec options.

Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
---
 debian.manta/config/config.common.ubuntu | 40 ++++++++++++++++----------------
 1 file changed, 20 insertions(+), 20 deletions(-)
diff mbox

Patch

diff --git a/debian.manta/config/config.common.ubuntu b/debian.manta/config/config.common.ubuntu
index e5e2eb77..1c7c512 100644
--- a/debian.manta/config/config.common.ubuntu
+++ b/debian.manta/config/config.common.ubuntu
@@ -980,27 +980,27 @@  CONFIG_IMA_AUDIT=y
 CONFIG_IMA_LSM_RULES=y
 CONFIG_IMA_MEASURE_PCR_IDX=10
 CONFIG_INET=y
-CONFIG_INET6_AH=y
-CONFIG_INET6_ESP=y
-CONFIG_INET6_IPCOMP=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
 CONFIG_INET6_TUNNEL=y
-CONFIG_INET6_XFRM_MODE_BEET=y
+CONFIG_INET6_XFRM_MODE_BEET=m
 # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-CONFIG_INET6_XFRM_MODE_TRANSPORT=y
-CONFIG_INET6_XFRM_MODE_TUNNEL=y
-CONFIG_INET6_XFRM_TUNNEL=y
-CONFIG_INET_AH=y
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET_AH=m
 CONFIG_INET_DIAG=y
-CONFIG_INET_ESP=y
-CONFIG_INET_IPCOMP=y
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
 # CONFIG_INET_LRO is not set
 CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=y
 # CONFIG_INET_UDP_DIAG is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_INLINE_READ_LOCK is not set
@@ -1563,7 +1563,7 @@  CONFIG_NET_EMATCH_TEXT=m
 CONFIG_NET_EMATCH_U32=m
 # CONFIG_NET_IPGRE_DEMUX is not set
 # CONFIG_NET_IPIP is not set
-CONFIG_NET_KEY=y
+CONFIG_NET_KEY=m
 # CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_NET_NS=y
 # CONFIG_NET_PKTGEN is not set
@@ -2680,11 +2680,11 @@  CONFIG_WIRELESS_EXT_SYSFS=y
 CONFIG_WLAN=y
 # CONFIG_X25 is not set
 CONFIG_XFRM=y
-CONFIG_XFRM_IPCOMP=y
-CONFIG_XFRM_MIGRATE=y
-CONFIG_XFRM_STATISTICS=y
-CONFIG_XFRM_SUB_POLICY=y
-CONFIG_XFRM_USER=y
+CONFIG_XFRM_IPCOMP=m
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+CONFIG_XFRM_USER=m
 # CONFIG_XFS_FS is not set
 # CONFIG_XIP_KERNEL is not set
 CONFIG_XPS=y