logger: fix a problem of losing all argv except first

[oweals/busybox.git] / Config.in

diff --git a/Config.in b/Config.in
index c5f8b3c0f7f1bda2cef14d9cc6b87a1402df834a..450c4a6d4593b2258a0ef01b6736bad3ce787f82 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -101,8 +101,7 @@ config FEATURE_INSTALLER
        help
          Enable 'busybox --install [-s]' support.  This will allow you to use
          busybox at runtime to create hard links or symlinks for all the
-         applets that are compiled into busybox.  This feature requires the
-         /proc filesystem.
+         applets that are compiled into busybox.
 
 config LOCALE_SUPPORT
        bool "Enable locale support (system needs locale for this to work)"
@@ -141,6 +140,13 @@ config FEATURE_CLEAN_UP
          Don't enable this unless you have a really good reason to clean
          things up manually.
 
+config FEATURE_PIDFILE
+       bool "Support writing pidfiles"
+       default n
+       help
+         This option makes some applets (e.g. crond, syslogd, inetd) write
+         a pidfile in /var/run. Some applications rely on them.
+
 config FEATURE_SUID
        bool "Support for SUID/SGID handling"
        default n
@@ -156,13 +162,6 @@ config FEATURE_SUID
          are login, passwd, su, ping, traceroute, crontab, dnsd, ipcrm, ipcs,
          and vlock.
 
-config FEATURE_SYSLOG
-       bool "Support for syslog"
-       default n
-       help
-         This option is auto-selected when you select any applet which may
-         send its output to syslog. You do not need to select it manually.
-
 config FEATURE_SUID_CONFIG
        bool "Runtime SUID/SGID configuration via /etc/busybox.conf"
        default n if FEATURE_SUID
@@ -203,14 +202,6 @@ config FEATURE_SUID_CONFIG_QUIET
          /etc/busybox.conf should be readable by the user needing the SUID, check
          this option to avoid users to be notified about missing permissions.
 
-config FEATURE_HAVE_RPC
-       bool "RPC support"
-       default y
-       help
-         Select this if you have rpc support.
-         This automatically turns off all configuration options that rely
-         on RPC.
-
 config SELINUX
        bool "Support NSA Security Enhanced Linux"
        default n
@@ -231,13 +222,19 @@ config SELINUX
 
          Most people will leave this set to 'N'.
 
-config FEATURE_EXEC_PREFER_APPLETS
+config FEATURE_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.
+         searching the PATH. This is typically done by exec'ing
+         /proc/self/exe.
+         This may affect shell, find -exec, xargs and similar applets.
+         They will use applets even if /bin/<applet> -> busybox link
+         is missing (or is not a link to busybox). However, this causes
+         problems in chroot jails without mounted /proc and with ps/top
+         (command name can be shown as 'exe' for applets started this way).
 
 config BUSYBOX_EXEC_PATH
        string "Path to BusyBox executable"
@@ -249,6 +246,22 @@ config BUSYBOX_EXEC_PATH
          executable.  If you haven't got /proc, set this to wherever you
          want to run BusyBox from.
 
+# These are auto-selected by other options
+
+config FEATURE_SYSLOG
+       bool "Support for logging to syslog"
+       default n
+       help
+         This option is auto-selected when you select any applet which may
+         send its output to syslog. You do not need to select it manually.
+
+config FEATURE_HAVE_RPC
+       bool "RPC support"
+       default n
+       help
+         This is automatically selected if any of enabled applets need it.
+         You do not need to select it manually.
+
 endmenu
 
 menu 'Build Options'
@@ -375,7 +388,6 @@ config WERROR
 choice
        prompt "Additional debugging library"
        default NO_DEBUG_LIB
-       depends on DEBUG
        help
          Using an additional debugging library will make BusyBox become
          considerable larger and will cause it to run more slowly.  You
@@ -453,12 +465,41 @@ config INSTALL_APPLET_HARDLINKS
          Install applets as hard-links to the busybox binary. This might count
          on a filesystem with few inodes.
 
+config INSTALL_APPLET_SCRIPT_WRAPPERS
+       bool "as script wrappers"
+       help
+         Install applets as script wrappers that call the busybox binary.
+
 config INSTALL_APPLET_DONT
        bool "not installed"
-       depends on FEATURE_INSTALLER || FEATURE_SH_STANDALONE_SHELL || FEATURE_EXEC_PREFER_APPLETS
+       depends on FEATURE_INSTALLER || FEATURE_SH_STANDALONE || FEATURE_PREFER_APPLETS
        help
          Do not install applet links. Useful when using the -install feature
-         or a standalone shell for rescue pruposes.
+         or a standalone shell for rescue purposes.
+
+endchoice
+
+choice
+       prompt "/bin/sh applet link"
+       default INSTALL_SH_APPLET_SYMLINK
+       depends on INSTALL_APPLET_SCRIPT_WRAPPERS
+       help
+         Choose how you install /bin/sh applet link.
+
+config INSTALL_SH_APPLET_SYMLINK
+       bool "as soft-link"
+       help
+         Install /bin/sh applet as soft-link to the busybox binary.
+
+config INSTALL_SH_APPLET_HARDLINK
+       bool "as hard-link"
+       help
+         Install /bin/sh applet as hard-link to the busybox binary.
+
+config INSTALL_SH_APPLET_SCRIPT_WRAPPER
+       bool "as script wrapper"
+       help
+         Install /bin/sh applet as script wrapper that call the busybox binary.
 
 endchoice
 
@@ -493,3 +534,5 @@ source procps/Config.in
 source shell/Config.in
 source sysklogd/Config.in
 source runit/Config.in
+source selinux/Config.in
+source ipsvd/Config.in