From: Phillip Hellewell This patch modifies the fs/Kconfig and fs/Makefile files to incorporate eCryptfs into the kernel build. Signed-off-by: Phillip Hellewell Signed-off-by: Michael Halcrow Signed-off-by: Andrew Morton --- fs/Kconfig | 18 ++++++++++++++++++ fs/Makefile | 1 + 2 files changed, 19 insertions(+) diff -puN fs/Kconfig~ecryptfs-fs-makefile-and-fs-kconfig fs/Kconfig --- devel/fs/Kconfig~ecryptfs-fs-makefile-and-fs-kconfig 2006-05-13 00:25:34.000000000 -0700 +++ devel-akpm/fs/Kconfig 2006-05-13 00:25:34.000000000 -0700 @@ -966,6 +966,24 @@ config AFFS_FS To compile this file system support as a module, choose M here: the module will be called affs. If unsure, say N. +config ECRYPT_FS + tristate "eCrypt filesystem layer support (EXPERIMENTAL)" + depends on EXPERIMENTAL && KEYS && CRYPTO + help + Encrypted filesystem that operates on the VFS layer. See + Documentation/ecryptfs.txt to learn more about eCryptfs. + + To compile this file system support as a module, choose M here: the + module will be called ecryptfs. + +config ECRYPT_DEBUG + bool "Enable eCryptfs debug mode" + depends on ECRYPT_FS + help + Turn on debugging code in eCryptfs. + + If unsure, say N. + config HFS_FS tristate "Apple Macintosh file system support (EXPERIMENTAL)" depends on EXPERIMENTAL diff -puN fs/Makefile~ecryptfs-fs-makefile-and-fs-kconfig fs/Makefile --- devel/fs/Makefile~ecryptfs-fs-makefile-and-fs-kconfig 2006-05-13 00:25:34.000000000 -0700 +++ devel-akpm/fs/Makefile 2006-05-13 00:25:34.000000000 -0700 @@ -70,6 +70,7 @@ obj-$(CONFIG_ISO9660_FS) += isofs/ obj-$(CONFIG_DEVFS_FS) += devfs/ obj-$(CONFIG_HFSPLUS_FS) += hfsplus/ # Before hfs to find wrapped HFS+ obj-$(CONFIG_HFS_FS) += hfs/ +obj-$(CONFIG_ECRYPT_FS) += ecryptfs/ obj-$(CONFIG_VXFS_FS) += freevxfs/ obj-$(CONFIG_NFS_FS) += nfs/ obj-$(CONFIG_EXPORTFS) += exportfs/ _