aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Dickinson <openwrt@daniel.thecshore.com>2015-12-16 22:58:11 -0500
committerJohn Crispin <john@phrozen.org>2016-07-05 22:59:14 +0200
commitb9952797e63496817d60dda394949a91fbdaddd4 (patch)
treed9d456bc69f5d8956eab615910130d1521ed53cc
parenteca1021e5c020e2421e400ff6c87f31c06262ebf (diff)
downloadupstream-b9952797e63496817d60dda394949a91fbdaddd4.tar.gz
upstream-b9952797e63496817d60dda394949a91fbdaddd4.tar.bz2
upstream-b9952797e63496817d60dda394949a91fbdaddd4.zip
kernel: Move POSIX ACL and attr support options into submenu
Make global options menuconfig cleaner by moving POSIX ACL and attr support options into a submenu. Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
-rw-r--r--config/Config-kernel.in147
1 files changed, 75 insertions, 72 deletions
diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index 8b3989dbea..b9aaac50f7 100644
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -631,87 +631,90 @@ if KERNEL_IP_PNP
endif
-config USE_FS_ACL_ATTR
- bool "Use filesystem ACL and attr support by default"
- default n
- help
- Make using ACLs (e.g. POSIX ACL, NFSv4 ACL) the default
- for kernel and packages, except tmpfs, flash filesystems,
- and old NFS. Also enable userspace extended attribute support
- by default. (OpenWrt already has an expection it will be
- present in the kernel).
-
-config KERNEL_FS_POSIX_ACL
- bool "Enable POSIX ACL support"
- default y if USE_FS_ACL_ATTR
-
-config KERNEL_BTRFS_FS_POSIX_ACL
- bool "Enable POSIX ACL for BtrFS Filesystems"
- select KERNEL_FS_POSIX_ACL
- default y if USE_FS_ACL_ATTR
-
-config KERNEL_EXT4_FS_POSIX_ACL
- bool "Enable POSIX ACL for Ext4 Filesystems"
- select KERNEL_FS_POSIX_ACL
- default y if USE_FS_ACL_ATTR
-
-config KERNEL_F2FS_FS_POSIX_ACL
- bool "Enable POSIX ACL for F2FS Filesystems"
- select KERNEL_FS_POSIX_ACL
- default n
+menu "Filesystem ACL and attr support options"
+ config USE_FS_ACL_ATTR
+ bool "Use filesystem ACL and attr support by default"
+ default n
+ help
+ Make using ACLs (e.g. POSIX ACL, NFSv4 ACL) the default
+ for kernel and packages, except tmpfs, flash filesystems,
+ and old NFS. Also enable userspace extended attribute support
+ by default. (OpenWrt already has an expection it will be
+ present in the kernel).
+
+ config KERNEL_FS_POSIX_ACL
+ bool "Enable POSIX ACL support"
+ default y if USE_FS_ACL_ATTR
+
+ config KERNEL_BTRFS_FS_POSIX_ACL
+ bool "Enable POSIX ACL for BtrFS Filesystems"
+ select KERNEL_FS_POSIX_ACL
+ default y if USE_FS_ACL_ATTR
+
+ config KERNEL_EXT4_FS_POSIX_ACL
+ bool "Enable POSIX ACL for Ext4 Filesystems"
+ select KERNEL_FS_POSIX_ACL
+ default y if USE_FS_ACL_ATTR
+
+ config KERNEL_F2FS_FS_POSIX_ACL
+ bool "Enable POSIX ACL for F2FS Filesystems"
+ select KERNEL_FS_POSIX_ACL
+ default n
-config KERNEL_JFFS2_FS_POSIX_ACL
- bool "Enable POSIX ACL for JFFS2 Filesystems"
- select KERNEL_FS_POSIX_ACL
- default n
+ config KERNEL_JFFS2_FS_POSIX_ACL
+ bool "Enable POSIX ACL for JFFS2 Filesystems"
+ select KERNEL_FS_POSIX_ACL
+ default n
-config KERNEL_TMPFS_POSIX_ACL
- bool "Enable POSIX ACL for TMPFS Filesystems"
- select KERNEL_FS_POSIX_ACL
- default n
+ config KERNEL_TMPFS_POSIX_ACL
+ bool "Enable POSIX ACL for TMPFS Filesystems"
+ select KERNEL_FS_POSIX_ACL
+ default n
-config KERNEL_CIFS_ACL
- bool "Enable CIFS ACLs"
- select KERNEL_FS_POSIX_ACL
- default y if USE_FS_ACL_ATTR
+ config KERNEL_CIFS_ACL
+ bool "Enable CIFS ACLs"
+ select KERNEL_FS_POSIX_ACL
+ default y if USE_FS_ACL_ATTR
-config KERNEL_HFS_FS_POSIX_ACL
- bool "Enable POSIX ACL for HFS Filesystems"
- select KERNEL_FS_POSIX_ACL
- default y if USE_FS_ACL_ATTR
+ config KERNEL_HFS_FS_POSIX_ACL
+ bool "Enable POSIX ACL for HFS Filesystems"
+ select KERNEL_FS_POSIX_ACL
+ default y if USE_FS_ACL_ATTR
-config KERNEL_HFSPLUG_FS_POSIX_ACL
- bool "Enable POSIX ACL for HFS+ Filesystems"
- select KERNEL_FS_POSIX_ACL
- default y if USE_FS_ACL_ATTR
+ config KERNEL_HFSPLUG_FS_POSIX_ACL
+ bool "Enable POSIX ACL for HFS+ Filesystems"
+ select KERNEL_FS_POSIX_ACL
+ default y if USE_FS_ACL_ATTR
-config KERNEL_NFS_ACL_SUPPORT
- bool "Enable ACLs for NFS"
- default y if USE_FS_ACL_ATTR
+ config KERNEL_NFS_ACL_SUPPORT
+ bool "Enable ACLs for NFS"
+ default y if USE_FS_ACL_ATTR
-config KERNEL_NFS_V3_ACL_SUPPORT
- bool "Enable ACLs for NFSv3"
- default n
+ config KERNEL_NFS_V3_ACL_SUPPORT
+ bool "Enable ACLs for NFSv3"
+ default n
-config KERNEL_NFSD_V2_ACL_SUPPORT
- bool "Enable ACLs for NFSDv2"
- default n
+ config KERNEL_NFSD_V2_ACL_SUPPORT
+ bool "Enable ACLs for NFSDv2"
+ default n
-config KERNEL_NFSD_V3_ACL_SUPPORT
- bool "Enable ACLs for NFSDv3"
- default n
+ config KERNEL_NFSD_V3_ACL_SUPPORT
+ bool "Enable ACLs for NFSDv3"
+ default n
+
+ config KERNEL_REISER_FS_POSIX_ACL
+ bool "Enable POSIX ACLs for ReiserFS"
+ select KERNEL_FS_POSIX_ACL
+ default y if USE_FS_ACL_ATTR
-config KERNEL_REISER_FS_POSIX_ACL
- bool "Enable POSIX ACLs for ReiserFS"
- select KERNEL_FS_POSIX_ACL
- default y if USE_FS_ACL_ATTR
+ config KERNEL_XFS_POSIX_ACL
+ bool "Enable POSIX ACLs for XFS"
+ select KERNEL_FS_POSIX_ACL
+ default y if USE_FS_ACL_ATTR
-config KERNEL_XFS_POSIX_ACL
- bool "Enable POSIX ACLs for XFS"
- select KERNEL_FS_POSIX_ACL
- default y if USE_FS_ACL_ATTR
+ config KERNEL_JFS_POSIX_ACL
+ bool "Enable POSIX ACLs for JFS"
+ select KERNEL_FS_POSIX_ACL
+ default y if USE_FS_ACL_ATTR
-config KERNEL_JFS_POSIX_ACL
- bool "Enable POSIX ACLs for JFS"
- select KERNEL_FS_POSIX_ACL
- default y if USE_FS_ACL_ATTR
+endmenu