accidentally applied wrong (old) patch, fixing up...

[oweals/busybox.git] / Config.in

diff --git a/Config.in b/Config.in
index fb07c681bb1630f08da8e24dfc2a9c72e68fcc8c..499233bc162157ad5d11b85a8da75b4feb3ef8a7 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -231,6 +231,14 @@ config SELINUX
 
          Most people will leave this set to 'N'.
 
+config FEATURE_EXEC_PREFER_APPLETS
+       bool "exec prefers applets"
+       default n
+       help
+         This is an experimental option which directs applets about to
+         call 'exec' to try and find an applicable busybox applet before
+         searching the executable path for a binary or symlink to execute.
+
 config BUSYBOX_EXEC_PATH
        string "Path to BusyBox executable"
        default "/proc/self/exe"
@@ -397,14 +405,14 @@ config EFENCE
 
 endchoice
 
-config DEBUG_YANK_SUSv2
-       bool "Disable obsolete features removed before SUSv3?"
+config INCLUDE_SUSv2
+       bool "Enable obsolete features removed before SUSv3?"
        default y
        help
-         This option will disable backwards compatibility with SuSv2,
+         This option will enable backwards compatibility with SuSv2,
          specifically, old-style numeric options ('command -1 <file>')
-         will not be supported in head, tail, and fold.  (Note: should
-         yank from renice too.)
+         will be supported in head, tail, and fold.  (Note: should
+         affect renice too.)
 
 endmenu
 
@@ -418,31 +426,30 @@ config INSTALL_NO_USR
          that you really want this behaviour.
 
 choice
-       prompt "Applets links"
-       default INSTALL_APPLET_SYMLINKS
-       help
-         Choose how you install applets links.
+       prompt "Applets links"
+       default INSTALL_APPLET_SYMLINKS
+       help
+         Choose how you install applets links.
 
 config INSTALL_APPLET_SYMLINKS
-       bool "as soft-links"
-       help
-         Install applets as soft-links to the busybox binary. This needs some
-         free inodes on the filesystem, but might help with filesystem
-         generators that can't cope with hard-links.
+       bool "as soft-links"
+       help
+         Install applets as soft-links to the busybox binary. This needs some
+         free inodes on the filesystem, but might help with filesystem
+         generators that can't cope with hard-links.
 
 config INSTALL_APPLET_HARDLINKS
-       bool "as hard-links"
-       help
-         Install applets as hard-links to the busybox binary. This might count
-         on a filesystem with few inodes.
+       bool "as hard-links"
+       help
+         Install applets as hard-links to the busybox binary. This might count
+         on a filesystem with few inodes.
 
 config INSTALL_APPLET_DONT
-       bool
-       prompt "not installed"
-       depends on FEATURE_INSTALLER || FEATURE_SH_STANDALONE_SHELL
-       help
-         Do not install applets links. Usefull when using the -install feature
-         or a standalone shell for rescue pruposes.
+       bool "not installed"
+       depends on FEATURE_INSTALLER || FEATURE_SH_STANDALONE_SHELL || FEATURE_EXEC_PREFER_APPLETS
+       help
+         Do not install applet links. Useful when using the -install feature
+         or a standalone shell for rescue pruposes.
 
 endchoice