diff mbox

[1/5] UBUNTU: [Config] CONFIG_ECRYPT_FS=y

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

Commit Message

Tyler Hicks June 27, 2014, 11:23 p.m. UTC 
CONFIG_ECRYPT_FS depends on CONFIG_KEYS. Other config option prompts are
set according to the distro kernel config.

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

Patch

diff --git a/debian.manta/config/config.common.ubuntu b/debian.manta/config/config.common.ubuntu
index 7a10d5c..b7d4b52 100644
--- a/debian.manta/config/config.common.ubuntu
+++ b/debian.manta/config/config.common.ubuntu
@@ -350,16 +350,20 @@  CONFIG_CHR_DEV_SCH=y
 CONFIG_CHR_DEV_SG=y
 # CONFIG_CHR_DEV_ST is not set
 CONFIG_CIFS=m
+CONFIG_CIFS_ACL=y
 # CONFIG_CIFS_DEBUG2 is not set
+CONFIG_CIFS_DFS_UPCALL=y
 CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_UPCALL=y
 # CONFIG_CIFS_WEAK_PW_HASH is not set
 CONFIG_CIFS_XATTR=y
 CONFIG_CLEANCACHE=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLS_U32_MARK=y
 # CONFIG_CLS_U32_PERF is not set
+CONFIG_CLZ_TAB=y
 CONFIG_CMA=y
 CONFIG_CMA_BEST_FIT=y
 # CONFIG_CMA_DEVELOPEMENT is not set
@@ -480,6 +484,7 @@  CONFIG_CRYPTO_PCOMP2=y
 # CONFIG_CRYPTO_RMD160 is not set
 # CONFIG_CRYPTO_RMD256 is not set
 # CONFIG_CRYPTO_RMD320 is not set
+CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
 # CONFIG_CRYPTO_SALSA20 is not set
 # CONFIG_CRYPTO_SEED is not set
@@ -594,6 +599,7 @@  CONFIG_DM_UEVENT=y
 # CONFIG_DM_VERITY is not set
 # CONFIG_DM_ZERO is not set
 CONFIG_DNOTIFY=y
+CONFIG_DNS_RESOLVER=y
 CONFIG_DQL=y
 # CONFIG_DRAGONRISE_FF is not set
 # CONFIG_DRM is not set
@@ -606,6 +612,7 @@  CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DYNAMIC_FTRACE=y
 # CONFIG_ECHO is not set
 # CONFIG_ECONET is not set
+CONFIG_ECRYPT_FS=y
 # CONFIG_EEPROM_93CX6 is not set
 # CONFIG_EEPROM_93XX46 is not set
 # CONFIG_EEPROM_AT24 is not set
@@ -619,12 +626,14 @@  CONFIG_EMBEDDED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENCLOSURE_SERVICES is not set
+CONFIG_ENCRYPTED_KEYS=y
 CONFIG_EPOLL=y
 # CONFIG_EQUALIZER is not set
 # CONFIG_ETHERNET is not set
 CONFIG_EVENTFD=y
 CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
 CONFIG_EVENT_TRACING=y
+CONFIG_EVM=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_EXPERT=y
 CONFIG_EXT2_FS=y
@@ -1050,6 +1059,8 @@  CONFIG_INPUT_TABLET=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_INPUT_UINPUT=y
 # CONFIG_INPUT_YEALINK is not set
+CONFIG_INTEGRITY=y
+CONFIG_INTEGRITY_SIGNATURE=y
 # CONFIG_INV_IIO_MPU3050_ACCEL_SLAVE_BMA250 is not set
 CONFIG_INV_MPU_IIO=y
 # CONFIG_INV_TESTING is not set
@@ -1213,7 +1224,8 @@  CONFIG_KERNEL_GZIP=y
 # CONFIG_KEYBOARD_TCA6416 is not set
 # CONFIG_KEYBOARD_TCA8418 is not set
 # CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
 CONFIG_KGDB=y
 CONFIG_KGDB_KDB=y
 CONFIG_KGDB_SERIAL_CONSOLE=y
@@ -1414,6 +1426,7 @@  CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
+CONFIG_MPILIB=y
 CONFIG_MSDOS_FS=y
 CONFIG_MSDOS_PARTITION=y
 # CONFIG_MTD is not set
@@ -2046,6 +2059,7 @@  CONFIG_SERIAL_SAMSUNG_UARTS_4=y
 # CONFIG_SGI_PARTITION is not set
 CONFIG_SHMEM=y
 CONFIG_SIGNALFD=y
+CONFIG_SIGNATURE=y
 # CONFIG_SLAB is not set
 CONFIG_SLABINFO=y
 CONFIG_SLHC=y