config.in features patch from Giulio Orsero <giulioo@pobox.com>

with some minor edits from me

6 files changed, 61 insertions, 10 deletions

diff --git a/archival/config.in b/archival/config.in
index c21f921..76a192e 100644
--- a/archival/config.in
+++ b/archival/config.in
@@ -16,7 +16,8 @@ bool 'gzip'	    CONFIG_GZIP
 bool 'rpm2cpio'     CONFIG_RPM2CPIO
 bool 'tar'	    CONFIG_TAR
 if [ "$CONFIG_TAR" = "y" ] ; then
-	bool ' creation support' CONFIG_FEATURE_TAR_CREATE
-	bool ' exclude support'	CONFIG_FEATURE_TAR_EXCLUDE
+    bool '  Enable archive creation'	CONFIG_FEATURE_TAR_CREATE
+    bool '  Enable -X and --exclude options (exclude files)'	CONFIG_FEATURE_TAR_EXCLUDE
+    bool '  Enable -z option (currently only for extracting)'	CONFIG_FEATURE_TAR_GZIP
 fi
 endmenu
diff --git a/editors/config.in b/editors/config.in
index 6c1d6ce..81d907b 100644
--- a/editors/config.in
+++ b/editors/config.in
@@ -8,5 +8,17 @@ comment 'Editors'
 
 bool 'sed'	    CONFIG_SED
 bool 'vi'	    CONFIG_VI
+if [ "$CONFIG_VI" = "y" ]; then
+    bool '  Enable ":" colon commands (no "ex" mode)'	CONFIG_FEATURE_VI_COLON
+    bool '  Enable yank/put commands and mark cmds'	CONFIG_FEATURE_VI_YANKMARK
+    bool '  Enable search and replace cmds'		CONFIG_FEATURE_VI_SEARCH
+    bool '  Catch signals'				CONFIG_FEATURE_VI_USE_SIGNALS
+    bool '  Remember previous cmd and "." cmd'		CONFIG_FEATURE_VI_DOT_CMD
+    bool '  Enable -R option and "view" mode'		CONFIG_FEATURE_VI_READONLY
+    bool '  Enable set-able options, ai ic showmatch'	CONFIG_FEATURE_VI_SETOPT
+    bool '  Support for :set'				CONFIG_FEATURE_VI_SET
+    bool '  Handle window resize'			CONFIG_FEATURE_VI_WIN_RESIZE
+    bool '  Optimize cursor movement'			CONFIG_FEATURE_VI_OPTIMIZE_CURSOR
+fi
 endmenu
 
diff --git a/findutils/config.in b/findutils/config.in
index 21e3680..770d752 100644
--- a/findutils/config.in
+++ b/findutils/config.in
@@ -7,9 +7,15 @@ mainmenu_option next_comment
 comment 'Finding Utilities'
 
 bool 'find'	    CONFIG_FIND
+if [ "$CONFIG_FIND" = "y" ] ; then
+    bool '  Enable modified time matching (-mtime) option' CONFIG_FEATURE_FIND_MTIME
+    bool '  Enable permissions matching (-perm) option' CONFIG_FEATURE_FIND_PERM
+    bool '  Enable filetype matching (-type) option' CONFIG_FEATURE_FIND_TYPE
+fi
 bool 'grep'	    CONFIG_GREP
 if [ "$CONFIG_GREP" = "y" ] ; then
-	bool ' egrep alias' CONFIG_FEATURE_GREP_EGREP_ALIAS
+    bool '  Support extended regular expressions (egrep & grep -E)'		CONFIG_FEATURE_GREP_EGREP_ALIAS
+    bool '  Enable before and after context flags (-A, -B and -C)' 	CONFIG_FEATURE_GREP_CONTEXT
 fi
 bool 'which'	    CONFIG_WHICH
 bool 'xargs'	    CONFIG_XARGS
diff --git a/modutils/config.in b/modutils/config.in
index fc00e33..802bcc1 100644
--- a/modutils/config.in
+++ b/modutils/config.in
@@ -13,9 +13,11 @@ bool 'modprobe'	    CONFIG_MODPROBE
 bool 'rmmod'	    CONFIG_RMMOD
 
 if [ "$CONFIG_INSMOD" = "y" ]; then
-    bool 'Support insmod/lsmod/rmmod for post 2.1 kernels'     CONFIG_FEATURE_NEW_MODULE_INTERFACE
-    bool 'Support insmod/lsmod/rmmod for pre  2.1 kernels'     CONFIG_FEATURE_OLD_MODULE_INTERFACE
+    comment 'Module support options'
+    bool 'Support for new (post 2.1) kernels'			CONFIG_FEATURE_NEW_MODULE_INTERFACE
+    bool 'Support for older (pre 2.1) Linux kernels'		CONFIG_FEATURE_OLD_MODULE_INTERFACE
     bool 'Support module version checking'			CONFIG_FEATURE_INSMOD_VERSION_CHECKING
+    bool 'Support image in kernel memory optimization (uClinux only)'		CONFIG_FEATURE_INSMOD_LOADINKMEM
 fi
 
 endmenu
diff --git a/procps/config.in b/procps/config.in
index c1ef61e..94d76b6 100644
--- a/procps/config.in
+++ b/procps/config.in
@@ -9,11 +9,14 @@ comment 'Process Utilities'
 bool 'free'	    CONFIG_FREE
 bool 'kill'	    CONFIG_KILL
 bool 'killall'      CONFIG_KILLALL
-if [ "$CONFIG_KILLALL" = "y" ] ; then
-	define_bool CONFIG_KILL	y
+if [ "$CONFIG_KILLALL" = "y" -a "$CONFIG_KILL" = "n" ] ; then
+    define_bool CONFIG_KILL	y
 fi
 bool 'pidof'	    CONFIG_PIDOF
 bool 'ps'	    CONFIG_PS
+if [ "$CONFIG_PS" = "y" ] ; then
+    bool '  Use devps instead of /proc (needs a patched kernel)'	CONFIG_FEATURE_USE_DEVPS_PATCH
+fi
 bool 'renice'	    CONFIG_RENICE
 bool 'uptime'	    CONFIG_UPTIME
 endmenu
diff --git a/util-linux/config.in b/util-linux/config.in
index 50a874d..067ced6 100644
--- a/util-linux/config.in
+++ b/util-linux/config.in
@@ -9,20 +9,47 @@ comment 'Linux System Utilities'
 
 bool 'dmesg'		    CONFIG_DMESG
 bool 'fbset'		    CONFIG_FBSET
+if [ "$CONFIG_FBSET" = "y" ]; then
+    bool '  Turn on extra fbset options'	CONFIG_FEATURE_FBSET_FANCY
+    bool '  Turn on fbset readmode support'	CONFIG_FEATURE_FBSET_READMODE
+fi
 bool 'fdflush'		    CONFIG_FDFLUSH
 bool 'freeramdisk'	    CONFIG_FREERAMDISK
 bool 'fsck_minix'	    CONFIG_FSCK_MINIX
+bool 'mkfs_minix'	    CONFIG_MKFS_MINIX
+if [ "$CONFIG_FSCK_MINIX" = "y" -o "$CONFIG_MKFS_MINIX" = "y" ]; then
+    comment '  Minix filesystem support'
+    bool '    Support Minix fs v2 (fsck_minix/mkfs_minix)'	CONFIG_FEATURE_MINIX2
+fi
 bool 'getopt'		    CONFIG_GETOPT
 bool 'hexdump'  	    CONFIG_HEXDUMP  
-bool 'mkfs_minix'	    CONFIG_MKFS_MINIX
 bool 'mkswap'		    CONFIG_MKSWAP
 bool 'more'		    CONFIG_MORE
+if [ "$CONFIG_MORE" = "y" ]; then
+    bool '  Use termios to manipulate the screen'		CONFIG_FEATURE_USE_TERMIOS
+fi 
+if [ "$CONFIG_LS" = "y" -o "$CONFIG_MORE" = "y"]; then
+    comment '  Common options for ls and more'
+    bool    '   Calculate terminal & column widths'	CONFIG_FEATURE_AUTOWIDTH
+fi
 bool 'mount'		    CONFIG_MOUNT
-bool 'nfsmount'		    CONFIG_NFSMOUNT
+if [ "$CONFIG_MOUNT" = "y" ]; then
+    bool '  Support mounting nfs file systems'		    	CONFIG_NFSMOUNT
+    bool '  Use devmtab instead of /proc (needs a patched kernel)'	CONFIG_FEATURE_USE_DEVPS_PATCH
+fi
+fi	
+bool 'umount'		    CONFIG_UMOUNT
+if [ "$CONFIG_UMOUNT" = "y" ]; then
+    bool '  Support forced filesystem unmounting'		CONFIG_FEATURE_MOUNT_FORCE
+fi
+if [ "$CONFIG_MOUNT" = "y" -o "$CONFIG_UMOUNT" = "y" ]; then
+    comment 'Common options for mount/umount'
+    bool '  Support for loop devices'				CONFIG_FEATURE_MOUNT_LOOP
+    bool '  Support for a real /etc/mtab (instead of /proc/mounts)'	CONFIG_FEATURE_MTAB_SUPPORT
+fi
 bool 'pivot_root'	    CONFIG_PIVOT_ROOT
 bool 'rdate'		    CONFIG_RDATE
 bool 'swaponoff'	    CONFIG_SWAPONOFF
-bool 'umount'		    CONFIG_UMOUNT
 
 endmenu