From 4a134ce8860ca115cb5b1076e948b2db803f6c96 Mon Sep 17 00:00:00 2001 From: Wynn Wolf Arbor Date: Sun, 16 Feb 2020 11:20:07 +0100 Subject: Remove deprecated kernel options --- fragments/base/common | 1 - fragments/base/crypto | 1 - fragments/base/net | 9 --------- fragments/fs/ext4 | 1 - fragments/net/nftables | 10 ---------- 5 files changed, 22 deletions(-) (limited to 'fragments') diff --git a/fragments/base/common b/fragments/base/common index 1a26566..2ce6b57 100644 --- a/fragments/base/common +++ b/fragments/base/common @@ -50,5 +50,4 @@ CONFIG_RTC_CLASS=y # https://lwn.net/Articles/681763/ CONFIG_BLK_WBT=y -CONFIG_BLK_WBT_SQ=y CONFIG_BLK_WBT_MQ=y diff --git a/fragments/base/crypto b/fragments/base/crypto index 0f63cdd..26919a8 100644 --- a/fragments/base/crypto +++ b/fragments/base/crypto @@ -1,4 +1,3 @@ CONFIG_DM_CRYPT=y -CONFIG_CRYPTO_AES_X86_64=y CONFIG_CRYPTO_USER_API_HASH=y CONFIG_CRYPTO_USER_API_SKCIPHER=y diff --git a/fragments/base/net b/fragments/base/net index 6aa8129..2387a46 100644 --- a/fragments/base/net +++ b/fragments/base/net @@ -29,14 +29,5 @@ CONFIG_SYN_COOKIES=y CONFIG_INET_UDP_DIAG=y CONFIG_INET_RAW_DIAG=y -# The following options enable support for IPsec and are enabled by default. -# We think wireguard is the superior solution, and hence disable them. -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set - # We do not need IPv6-in-IPv4 # CONFIG_IPV6_SIT is not set diff --git a/fragments/fs/ext4 b/fragments/fs/ext4 index c229a59..430d265 100644 --- a/fragments/fs/ext4 +++ b/fragments/fs/ext4 @@ -1,4 +1,3 @@ CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y -CONFIG_EXT4_ENCRYPTION=y diff --git a/fragments/net/nftables b/fragments/net/nftables index 148d48f..ef50432 100644 --- a/fragments/net/nftables +++ b/fragments/net/nftables @@ -37,7 +37,6 @@ CONFIG_NFT_DUP_NETDEV=y CONFIG_NFT_FWD_NETDEV=y CONFIG_NF_FLOW_TABLE_INET=y CONFIG_NF_FLOW_TABLE=y -CONFIG_NFT_CHAIN_ROUTE_IPV4=y CONFIG_NFT_DUP_IPV4=y CONFIG_NFT_FIB_INET=y CONFIG_NFT_FIB_IPV4=y @@ -46,20 +45,11 @@ CONFIG_NF_TABLES_ARP=y CONFIG_NF_FLOW_TABLE_IPV4=y CONFIG_NF_LOG_ARP=y CONFIG_NF_LOG_IPV4=y -CONFIG_NF_NAT_IPV4=y -CONFIG_NFT_CHAIN_NAT_IPV4=y -CONFIG_NFT_MASQ_IPV4=y -CONFIG_NFT_REDIR_IPV4=y -CONFIG_NFT_CHAIN_ROUTE_IPV6=y CONFIG_NFT_DUP_IPV6=y CONFIG_NFT_FIB_IPV6=y CONFIG_NFT_FIB_NETDEV=y CONFIG_NF_FLOW_TABLE_IPV6=y CONFIG_NF_LOG_IPV6=y -CONFIG_NF_NAT_IPV6=y -CONFIG_NFT_CHAIN_NAT_IPV6=y -CONFIG_NFT_MASQ_IPV6=y -CONFIG_NFT_REDIR_IPV6=y CONFIG_BRIDGE_NETFILTER=y CONFIG_BRIDGE_VLAN_FILTERING=y CONFIG_NF_TABLES_BRIDGE=y -- cgit v1.2.3-2-gb3c3