update busybox to v1.2.1

SVN-Revision: 4528
This commit is contained in:
Nicolas Thill 2006-08-08 10:27:25 +00:00
parent e3d5ff791f
commit 7a0d8ca5b4
28 changed files with 1609 additions and 1310 deletions

View File

@ -9,13 +9,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=busybox PKG_NAME:=busybox
PKG_VERSION:=1.1.3 PKG_VERSION:=1.2.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.busybox.net/downloads PKG_SOURCE_URL:=http://www.busybox.net/downloads
PKG_MD5SUM:=19a0b475169335f17e421cf644616fe7 PKG_MD5SUM:=362b3dc0f2023ddfda901dc1f1a74391
PKG_CAT:=bzcat PKG_CAT:=bzcat
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

View File

@ -12,9 +12,26 @@ menu "Busybox Settings"
menu "General Configuration" menu "General Configuration"
config BUSYBOX_CONFIG_NITPICK
bool "See lots more (probably unnecessary) configuration options."
default n
help
Some BusyBox applets have more configuration options than anyone
will ever care about. To avoid drowining people in complexity, most
of the applet features that can be set to a sane default value are
hidden, unless you hit the above switch.
This is better than to telling people to edit the busybox source
code, but not by much.
See http://en.wikipedia.org/wiki/Fibber_McGee_and_Molly#The_Closet
You have been warned.
choice choice
prompt "Buffer allocation policy" prompt "Buffer allocation policy"
default BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_ON_STACK default BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_ON_STACK
depends on BUSYBOX_CONFIG_NITPICK
help help
There are 3 ways BusyBox can handle buffer allocations: There are 3 ways BusyBox can handle buffer allocations:
- Use malloc. This costs code size for the call to xmalloc. - Use malloc. This costs code size for the call to xmalloc.
@ -36,15 +53,39 @@ config BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_IN_BSS
endchoice endchoice
config BUSYBOX_CONFIG_SHOW_USAGE
bool "Show terse applet usage messages"
default y
help
All BusyBox applets will show help messages when invoked with
wrong arguments. You can turn off printing these terse usage
messages if you say no here.
This will save you up to 7k.
config BUSYBOX_CONFIG_FEATURE_VERBOSE_USAGE config BUSYBOX_CONFIG_FEATURE_VERBOSE_USAGE
bool "Show verbose applet usage messages" bool "Show verbose applet usage messages"
default y default y
select BUSYBOX_CONFIG_SHOW_USAGE
help help
All BusyBox applets will show more verbose help messages when All BusyBox applets will show more verbose help messages when
busybox is invoked with --help. This will add a lot of text to the busybox is invoked with --help. This will add a lot of text to the
busybox binary. In the default configuration, this will add about busybox binary. In the default configuration, this will add about
13k, but it can add much more depending on your configuration. 13k, but it can add much more depending on your configuration.
config BUSYBOX_CONFIG_FEATURE_COMPRESS_USAGE
bool "Store applet usage messages in compressed form"
default n
depends on BUSYBOX_CONFIG_SHOW_USAGE && BUSYBOX_CONFIG_NITPICK
help
Store usage messages in compressed form, uncompress them on-the-fly
when <applet> --help is called.
If you have a really tiny busybox with few applets enabled (and
bunzip2 isn't one of them), the overhead of the decompressor might
be noticeable. Also, if you run executables directly from ROM
and have very little memory, this might not be a win. Otherwise,
you probably want this.
config BUSYBOX_CONFIG_FEATURE_INSTALLER config BUSYBOX_CONFIG_FEATURE_INSTALLER
bool "Support --install [-s] to install applet links at runtime" bool "Support --install [-s] to install applet links at runtime"
default n default n
@ -61,25 +102,29 @@ config BUSYBOX_CONFIG_LOCALE_SUPPORT
Enable this if your system has locale support and you would like Enable this if your system has locale support and you would like
busybox to support locale settings. busybox to support locale settings.
config BUSYBOX_CONFIG_FEATURE_DEVFS config BUSYBOX_CONFIG_GETOPT_LONG
bool "Support for devfs" bool
default y default y
help # bool "Enable support for --long-options"
Enable if you want BusyBox to work with devfs. # default n
# help
# Enable this if you want busybox applets to use the gnu --long-option
# style, in addition to single character -a -b -c style options.
config BUSYBOX_CONFIG_FEATURE_DEVPTS config BUSYBOX_CONFIG_FEATURE_DEVPTS
bool "Use the devpts filesystem for Unix98 PTYs" bool "Use the devpts filesystem for Unix98 PTYs"
default y if BUSYBOX_CONFIG_FEATURE_DEVFS default y
help help
Enable if you want BusyBox to use Unix98 PTY support. If enabled, Enable if you want BusyBox to use Unix98 PTY support. If enabled,
busybox will use /dev/ptmx for the master side of the pseudoterminal busybox will use /dev/ptmx for the master side of the pseudoterminal
and /dev/pts/<number> for the slave side. Otherwise, BSD style and /dev/pts/<number> for the slave side. Otherwise, BSD style
/dev/ttyp<number> will be used. To use this option, you should have /dev/ttyp<number> will be used. To use this option, you should have
devpts or devfs mounted. devpts mounted.
config BUSYBOX_CONFIG_FEATURE_CLEAN_UP config BUSYBOX_CONFIG_FEATURE_CLEAN_UP
bool "Clean up all memory before exiting (usually not needed)" bool "Clean up all memory before exiting (usually not needed)"
default n default n
depends on BUSYBOX_CONFIG_NITPICK
help help
As a size optimization, busybox normally exits without explicitly As a size optimization, busybox normally exits without explicitly
freeing dynamically allocated memory or closing files. This saves freeing dynamically allocated memory or closing files. This saves
@ -93,15 +138,25 @@ config BUSYBOX_CONFIG_FEATURE_SUID
bool "Support for SUID/SGID handling" bool "Support for SUID/SGID handling"
default y default y
help help
Support SUID and SGID binaries. With this option you can install the busybox binary belonging
to root with the suid bit set, and it'll and it'll automatically drop
priviledges for applets that don't need root access.
If you're really paranoid and don't want to do this, build two
busybox binaries with different applets in them (and the appropriate
symlinks pointing to each binary), and only set the suid bit on the
one that needs it. The applets currently marked to need the suid bit
are login, passwd, su, ping, traceroute, crontab, dnsd, ipcrm, ipcs,
and vlock.
config BUSYBOX_CONFIG_FEATURE_SUID_CONFIG config BUSYBOX_CONFIG_FEATURE_SUID_CONFIG
bool "Runtime SUID/SGID configuration via /etc/busybox.conf" bool "Runtime SUID/SGID configuration via /etc/busybox.conf"
default n if BUSYBOX_CONFIG_FEATURE_SUID default n if BUSYBOX_CONFIG_FEATURE_SUID
depends on BUSYBOX_CONFIG_FEATURE_SUID depends on BUSYBOX_CONFIG_FEATURE_SUID
help help
Allow the SUID / SGID state of an applet to be determined runtime by Allow the SUID / SGID state of an applet to be determined at runtime
checking /etc/busybox.conf. The format of this file is as follows: by checking /etc/busybox.conf. (This is sort of a poor man's sudo.)
The format of this file is as follows:
<applet> = [Ssx-][Ssx-][x-] (<username>|<uid>).(<groupname>|<gid>) <applet> = [Ssx-][Ssx-][x-] (<username>|<uid>).(<groupname>|<gid>)
@ -138,17 +193,32 @@ config BUSYBOX_CONFIG_SELINUX
bool "Support NSA Security Enhanced Linux" bool "Support NSA Security Enhanced Linux"
default n default n
help help
Enable support for SE Linux in applets ls, ps, and id. Also provide Enable support for SELinux in applets ls, ps, and id. Also provide
the option of compiling in SE Linux applets. the option of compiling in SELinux applets.
If you do not have a complete SE Linux Full Userland installed, this If you do not have a complete SELinux userland installed, this stuff
stuff will not compile. Go visit will not compile. Go visit
http://www.nsa.gov/selinux/index.html http://www.nsa.gov/selinux/index.html
to download the necessary stuff to allow busybox to compile with this to download the necessary stuff to allow busybox to compile with
option enabled. this option enabled. Specifially, libselinux 1.28 or better is
directly required by busybox. If the installation is located in a
non-standard directory, provide it by invoking make as follows:
CFLAGS=-I<libselinux-include-path> \
LDFLAGS=-L<libselinux-lib-path> \
make
Most people will leave this set to 'N'. Most people will leave this set to 'N'.
config BUSYBOX_CONFIG_BUSYBOX_EXEC_PATH
string "Path to BusyBox executable"
default "/proc/self/exe"
help
When Busybox applets need to run other busybox applets, BusyBox
sometimes needs to exec() itself. When the /proc filesystem is
mounted, /proc/self/exe always points to the currently running
executable. If you haven't got /proc, set this to wherever you
want to run BusyBox from.
endmenu endmenu
menu 'Build Options' menu 'Build Options'
@ -167,21 +237,18 @@ config BUSYBOX_CONFIG_STATIC
Most people will leave this set to 'N'. Most people will leave this set to 'N'.
# The busybox shared library feature is there so make standalone can produce
# smaller applets. Since make standalone isn't in yet, there's nothing using
# this yet, and so it's disabled.
config BUSYBOX_CONFIG_DISABLE_SHARED
bool
default n
config BUSYBOX_CONFIG_BUILD_LIBBUSYBOX config BUSYBOX_CONFIG_BUILD_LIBBUSYBOX
bool "Build shared libbusybox" bool "Build shared libbusybox"
default n default n
depends on BUSYBOX_CONFIG_DISABLE_SHARED
help help
Build a shared library libbusybox.so which contains all Build a shared library libbusybox.so which contains all
libraries used inside busybox. libraries used inside busybox.
This is an experimental feature intended to support the upcoming
"make standalone" mode. Enabling it against the one big busybox
binary serves no purpose (and increases the size). You should
almost certainly say "no" to this right now.
config BUSYBOX_CONFIG_FEATURE_FULL_LIBBUSYBOX config BUSYBOX_CONFIG_FEATURE_FULL_LIBBUSYBOX
bool "Feature-complete libbusybox" bool "Feature-complete libbusybox"
default n if !CONFIG_FEATURE_SHARED_BUSYBOX default n if !CONFIG_FEATURE_SHARED_BUSYBOX
@ -239,15 +306,6 @@ config BUSYBOX_CROSS_COMPILER_PREFIX
then I would enter '/usr/i386-linux-uclibc/bin/i386-uclibc-' here, then I would enter '/usr/i386-linux-uclibc/bin/i386-uclibc-' here,
which will ensure the correct compiler is used. which will ensure the correct compiler is used.
config BUSYBOX_EXTRA_CFLAGS_OPTIONS
string
default "-Os "
help
Do you want to pass any extra CFLAGS options to the compiler as
you build BusyBox? If so, this is the option for you... For example,
if you want to add some simple compiler switches (like -march=i686),
or check for warnings using -Werror, just those options here.
config BUSYBOX_CONFIG_BUILD_AT_ONCE config BUSYBOX_CONFIG_BUILD_AT_ONCE
bool "Compile all sources at once" bool "Compile all sources at once"
default n default n
@ -272,17 +330,27 @@ endmenu
menu 'Debugging Options' menu 'Debugging Options'
config BUSYBOX_CONFIG_DEBUG config BUSYBOX_CONFIG_DEBUG
bool "Build BusyBox with Debugging symbols" bool "Build BusyBox with extra Debugging symbols"
default n default n
help help
Say Y here if you wish to compile BusyBox with debugging symbols. Say Y here if you wish to examine BusyBox internals while applets are
This will allow you to use a debugger to examine BusyBox internals running. This increases the size of the binary considerably, and
while applets are running. This increases the size of the binary should only be used when doing development. If you are doing
considerably and should only be used when doing development. development and want to debug BusyBox, answer Y.
If you are doing development and want to debug BusyBox, answer Y.
Most people should answer N. Most people should answer N.
config BUSYBOX_CONFIG_DEBUG_PESSIMIZE
bool "Disable compiler optimizations."
default n
depends on BUSYBOX_CONFIG_DEBUG
help
The compiler's optimization of source code can eliminate and reorder
code, resulting in an executable that's hard to understand when
stepping through it with a debugger. This switches it off, resulting
in a much bigger executable that more closely matches the source
code.
choice choice
prompt "Additional debugging library" prompt "Additional debugging library"
default BUSYBOX_CONFIG_NO_DEBUG_LIB default BUSYBOX_CONFIG_NO_DEBUG_LIB
@ -329,7 +397,7 @@ config BUSYBOX_CONFIG_DEBUG_YANK_SUSv2
bool "Disable obsolete features removed before SUSv3?" bool "Disable obsolete features removed before SUSv3?"
default y default y
help help
This option will disable backwards compatability with SuSv2, This option will disable backwards compatibility with SuSv2,
specifically, old-style numeric options ('command -1 <file>') specifically, old-style numeric options ('command -1 <file>')
will not be supported in head, tail, and fold. (Note: should will not be supported in head, tail, and fold. (Note: should
yank from renice too.) yank from renice too.)

View File

@ -29,7 +29,7 @@ config BUSYBOX_CONFIG_AR
probably say N here. probably say N here.
config BUSYBOX_CONFIG_FEATURE_AR_LONG_FILENAMES config BUSYBOX_CONFIG_FEATURE_AR_LONG_FILENAMES
bool " Enable support for long filenames (not need for debs)" bool "Enable support for long filenames (not need for debs)"
default n default n
depends on BUSYBOX_CONFIG_AR depends on BUSYBOX_CONFIG_AR
help help
@ -89,7 +89,7 @@ config BUSYBOX_CONFIG_DPKG_DEB
probably say N here. probably say N here.
config BUSYBOX_CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY config BUSYBOX_CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY
bool " extract only (-x)" bool "extract only (-x)"
default n default n
depends on BUSYBOX_CONFIG_DPKG_DEB depends on BUSYBOX_CONFIG_DPKG_DEB
help help
@ -106,7 +106,7 @@ config BUSYBOX_CONFIG_GUNZIP
an archive, without decompressing it. an archive, without decompressing it.
config BUSYBOX_CONFIG_FEATURE_GUNZIP_UNCOMPRESS config BUSYBOX_CONFIG_FEATURE_GUNZIP_UNCOMPRESS
bool " Uncompress support" bool "Uncompress support"
default y default y
depends on BUSYBOX_CONFIG_GUNZIP depends on BUSYBOX_CONFIG_GUNZIP
help help
@ -150,7 +150,7 @@ config BUSYBOX_CONFIG_TAR
UNIX archive program. UNIX archive program.
config BUSYBOX_CONFIG_FEATURE_TAR_CREATE config BUSYBOX_CONFIG_FEATURE_TAR_CREATE
bool " Enable archive creation" bool "Enable archive creation"
default y default y
depends on BUSYBOX_CONFIG_TAR depends on BUSYBOX_CONFIG_TAR
help help
@ -158,7 +158,7 @@ config BUSYBOX_CONFIG_FEATURE_TAR_CREATE
tar archives using the `-c' option. tar archives using the `-c' option.
config BUSYBOX_CONFIG_FEATURE_TAR_BZIP2 config BUSYBOX_CONFIG_FEATURE_TAR_BZIP2
bool " Enable -j option to handle .tar.bz2 files" bool "Enable -j option to handle .tar.bz2 files"
default y default y
depends on BUSYBOX_CONFIG_TAR depends on BUSYBOX_CONFIG_TAR
help help
@ -166,7 +166,7 @@ config BUSYBOX_CONFIG_FEATURE_TAR_BZIP2
archives compressed with bzip2. archives compressed with bzip2.
config BUSYBOX_CONFIG_FEATURE_TAR_LZMA config BUSYBOX_CONFIG_FEATURE_TAR_LZMA
bool " Enable -a option to handle .tar.lzma files" bool "Enable -a option to handle .tar.lzma files"
default n default n
depends on BUSYBOX_CONFIG_TAR depends on BUSYBOX_CONFIG_TAR
help help
@ -174,7 +174,7 @@ config BUSYBOX_CONFIG_FEATURE_TAR_LZMA
archives compressed with lzma. archives compressed with lzma.
config BUSYBOX_CONFIG_FEATURE_TAR_FROM config BUSYBOX_CONFIG_FEATURE_TAR_FROM
bool " Enable -X (exclude from) and -T (include from) options)" bool "Enable -X (exclude from) and -T (include from) options)"
default y default y
depends on BUSYBOX_CONFIG_TAR depends on BUSYBOX_CONFIG_TAR
help help
@ -182,7 +182,7 @@ config BUSYBOX_CONFIG_FEATURE_TAR_FROM
a list of files to include or exclude from an archive. a list of files to include or exclude from an archive.
config BUSYBOX_CONFIG_FEATURE_TAR_GZIP config BUSYBOX_CONFIG_FEATURE_TAR_GZIP
bool " Enable -z option" bool "Enable -z option"
default y default y
depends on BUSYBOX_CONFIG_TAR depends on BUSYBOX_CONFIG_TAR
help help
@ -190,15 +190,15 @@ config BUSYBOX_CONFIG_FEATURE_TAR_GZIP
when creating or extracting tar gziped archives. when creating or extracting tar gziped archives.
config BUSYBOX_CONFIG_FEATURE_TAR_COMPRESS config BUSYBOX_CONFIG_FEATURE_TAR_COMPRESS
bool " Enable -Z option" bool "Enable -Z option"
default n default n
depends on BUSYBOX_CONFIG_TAR depends on BUSYBOX_CONFIG_TAR
help help
If you enable this option tar will be able to call uncompress, If you enable this option tar will be able to call uncompress,
when extracting .tar.Z archives. when extracting .tar.Z archives.
config BUSYBOX_CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY config BUSYBOX_CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY
bool " Enable support for old tar header format" bool "Enable support for old tar header format"
default n default n
depends on BUSYBOX_CONFIG_TAR depends on BUSYBOX_CONFIG_TAR
help help
@ -207,7 +207,7 @@ config BUSYBOX_CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY
repacking your ancient archives with the new format. repacking your ancient archives with the new format.
config BUSYBOX_CONFIG_FEATURE_TAR_GNU_EXTENSIONS config BUSYBOX_CONFIG_FEATURE_TAR_GNU_EXTENSIONS
bool " Enable support for some GNU tar extensions" bool "Enable support for some GNU tar extensions"
default y default y
depends on BUSYBOX_CONFIG_TAR depends on BUSYBOX_CONFIG_TAR
help help
@ -215,9 +215,9 @@ config BUSYBOX_CONFIG_FEATURE_TAR_GNU_EXTENSIONS
linknames. linknames.
config BUSYBOX_CONFIG_FEATURE_TAR_LONG_OPTIONS config BUSYBOX_CONFIG_FEATURE_TAR_LONG_OPTIONS
bool " Enable long options" bool "Enable long options"
default n default n
depends on BUSYBOX_CONFIG_TAR depends on BUSYBOX_CONFIG_TAR && BUSYBOX_CONFIG_GETOPT_LONG
help help
Enable use of long options, increases size by about 400 Bytes Enable use of long options, increases size by about 400 Bytes
@ -244,11 +244,11 @@ config BUSYBOX_CONFIG_UNLZMA
should probably say N here. should probably say N here.
config BUSYBOX_CONFIG_FEATURE_LZMA_FAST config BUSYBOX_CONFIG_FEATURE_LZMA_FAST
bool " Optimze unlzma for speed" bool "Optimze unlzma for speed"
default n default n
depends on BUSYBOX_CONFIG_UNLZMA depends on BUSYBOX_CONFIG_UNLZMA
help help
This option reduce decompression time by about 33% at the cost of This option reduces decompression time by about 33% at the cost of
a 2K bigger binary. a 2K bigger binary.
config BUSYBOX_CONFIG_UNZIP config BUSYBOX_CONFIG_UNZIP
@ -265,7 +265,7 @@ comment "Common options for cpio and tar"
depends on BUSYBOX_CONFIG_CPIO || BUSYBOX_CONFIG_TAR depends on BUSYBOX_CONFIG_CPIO || BUSYBOX_CONFIG_TAR
config BUSYBOX_CONFIG_FEATURE_UNARCHIVE_TAPE config BUSYBOX_CONFIG_FEATURE_UNARCHIVE_TAPE
bool " Enable tape drive support" bool "Enable tape drive support"
default n default n
depends on BUSYBOX_CONFIG_CPIO || BUSYBOX_CONFIG_TAR depends on BUSYBOX_CONFIG_CPIO || BUSYBOX_CONFIG_TAR
help help
@ -275,7 +275,7 @@ comment "Common options for dpkg and dpkg_deb"
depends on BUSYBOX_CONFIG_DPKG || BUSYBOX_CONFIG_DPKG_DEB depends on BUSYBOX_CONFIG_DPKG || BUSYBOX_CONFIG_DPKG_DEB
config BUSYBOX_CONFIG_FEATURE_DEB_TAR_GZ config BUSYBOX_CONFIG_FEATURE_DEB_TAR_GZ
bool " gzip debian packages (normal)" bool "gzip debian packages (normal)"
default n if BUSYBOX_CONFIG_DPKG || BUSYBOX_CONFIG_DPKG_DEB default n if BUSYBOX_CONFIG_DPKG || BUSYBOX_CONFIG_DPKG_DEB
depends on BUSYBOX_CONFIG_DPKG || BUSYBOX_CONFIG_DPKG_DEB depends on BUSYBOX_CONFIG_DPKG || BUSYBOX_CONFIG_DPKG_DEB
help help
@ -284,7 +284,7 @@ config BUSYBOX_CONFIG_FEATURE_DEB_TAR_GZ
If you want compatibility with standard .deb's you should say yes here. If you want compatibility with standard .deb's you should say yes here.
config BUSYBOX_CONFIG_FEATURE_DEB_TAR_BZ2 config BUSYBOX_CONFIG_FEATURE_DEB_TAR_BZ2
bool " bzip2 debian packages" bool "bzip2 debian packages"
default n default n
depends on BUSYBOX_CONFIG_DPKG || BUSYBOX_CONFIG_DPKG_DEB depends on BUSYBOX_CONFIG_DPKG || BUSYBOX_CONFIG_DPKG_DEB
help help
@ -295,7 +295,7 @@ config BUSYBOX_CONFIG_FEATURE_DEB_TAR_BZ2
use an internal control.tar.bz2 or data.tar.bz2. use an internal control.tar.bz2 or data.tar.bz2.
config BUSYBOX_CONFIG_FEATURE_DEB_TAR_LZMA config BUSYBOX_CONFIG_FEATURE_DEB_TAR_LZMA
bool " lzma debian packages" bool "lzma debian packages"
default n default n
depends on BUSYBOX_CONFIG_DPKG || BUSYBOX_CONFIG_DPKG_DEB depends on BUSYBOX_CONFIG_DPKG || BUSYBOX_CONFIG_DPKG_DEB
help help

View File

@ -65,6 +65,13 @@ config BUSYBOX_CONFIG_SETCONSOLE
This program redirects the system console to another device, This program redirects the system console to another device,
like the current tty while logged in via telnet. like the current tty while logged in via telnet.
config BUSYBOX_CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS
bool "Enable long options"
default n
depends on BUSYBOX_CONFIG_SET_CONSOLE && BUSYBOX_CONFIG_GETOPT_LONG
help
Support long options for the setconsole applet.
config BUSYBOX_CONFIG_SETKEYCODES config BUSYBOX_CONFIG_SETKEYCODES
bool "setkeycodes" bool "setkeycodes"
default n default n
@ -72,4 +79,10 @@ config BUSYBOX_CONFIG_SETKEYCODES
This program loads entries into the kernel's scancode-to-keycode This program loads entries into the kernel's scancode-to-keycode
map, allowing unusual keyboards to generate usable keycodes. map, allowing unusual keyboards to generate usable keycodes.
config BUSYBOX_CONFIG_SETLOGCONS
bool "setlogcons"
default n
help
This program redirects the output console of kernel messages.
endmenu endmenu

View File

@ -26,6 +26,13 @@ config BUSYBOX_CONFIG_CAT
cat is used to concatenate files and print them to the standard cat is used to concatenate files and print them to the standard
output. Enable this option if you wish to enable the 'cat' utility. output. Enable this option if you wish to enable the 'cat' utility.
config BUSYBOX_CONFIG_CATV
bool "catv"
default n
help
Display nonprinting characters as escape sequences (like some
implementations' cat -v option).
config BUSYBOX_CONFIG_CHGRP config BUSYBOX_CONFIG_CHGRP
bool "chgrp" bool "chgrp"
default y default y
@ -52,6 +59,12 @@ config BUSYBOX_CONFIG_CHROOT
chroot is used to change the root directory and run a command. chroot is used to change the root directory and run a command.
The default command is `/bin/sh'. The default command is `/bin/sh'.
config BUSYBOX_CONFIG_CKSUM
bool "cksum"
default n
help
cksum is used to calculate the CRC32 checksum of a file.
config BUSYBOX_CONFIG_CMP config BUSYBOX_CONFIG_CMP
bool "cmp" bool "cmp"
default n default n
@ -87,7 +100,7 @@ config BUSYBOX_CONFIG_DATE
current time in the given format. current time in the given format.
config BUSYBOX_CONFIG_FEATURE_DATE_ISOFMT config BUSYBOX_CONFIG_FEATURE_DATE_ISOFMT
bool " Enable ISO date format output (-I)" bool "Enable ISO date format output (-I)"
default y default y
depends on BUSYBOX_CONFIG_DATE depends on BUSYBOX_CONFIG_DATE
help help
@ -102,6 +115,26 @@ config BUSYBOX_CONFIG_DD
by default) using specific input and output blocksizes, by default) using specific input and output blocksizes,
while optionally performing conversions on it. while optionally performing conversions on it.
config BUSYBOX_CONFIG_FEATURE_DD_SIGNAL_HANDLING
bool "Enable DD signal handling for status reporting"
default y
depends on BUSYBOX_CONFIG_DD
help
sending a SIGUSR1 signal to a running `dd' process makes it
print to standard error the number of records read and written
so far, then to resume copying.
$ dd if=/dev/zero of=/dev/null& pid=$! $ kill -USR1 $pid; sleep 1; kill $pid
10899206+0 records in 10899206+0 records out
config BUSYBOX_CONFIG_FEATURE_DD_IBS_OBS
bool "Enable ibs, obs and conv options"
default n
depends on BUSYBOX_CONFIG_DD
help
Enables support for writing a certain number of bytes in and out,
at a time, and performing conversions on the data stream.
config BUSYBOX_CONFIG_DF config BUSYBOX_CONFIG_DF
bool "df" bool "df"
default y default y
@ -109,6 +142,38 @@ config BUSYBOX_CONFIG_DF
df reports the amount of disk space used and available df reports the amount of disk space used and available
on filesystems. on filesystems.
config BUSYBOX_CONFIG_DIFF
bool "diff"
default n
help
diff compares two files or directories and outputs the
differences between them in a form that can be given to
the patch command.
config BUSYBOX_CONFIG_FEATURE_DIFF_BINARY
bool "Enable checks for binary files"
default n
depends on BUSYBOX_CONFIG_DIFF
help
This option enables support for checking for binary files
before a comparison is carried out.
config BUSYBOX_CONFIG_FEATURE_DIFF_DIR
bool "Enable directory support"
default n
depends on BUSYBOX_CONFIG_DIFF
help
This option enables support for directory and subdirectory
comparison.
config BUSYBOX_CONFIG_FEATURE_DIFF_MINIMAL
bool "Enable -d option to find smaller sets of changes"
default n
depends on BUSYBOX_CONFIG_DIFF
help
Enabling this option allows the use of -d to make diff
try hard to find the smallest possible set of changes.
config BUSYBOX_CONFIG_DIRNAME config BUSYBOX_CONFIG_DIRNAME
bool "dirname" bool "dirname"
default y default y
@ -127,6 +192,9 @@ config BUSYBOX_CONFIG_UNIX2DOS
bool bool
default n default n
depends on BUSYBOX_CONFIG_DOS2UNIX depends on BUSYBOX_CONFIG_DOS2UNIX
help
unix2dos is used to convert a text file from UNIX format to
DOS format, and vice versa.
config BUSYBOX_CONFIG_DU config BUSYBOX_CONFIG_DU
bool "du (default blocksize of 512 bytes)" bool "du (default blocksize of 512 bytes)"
@ -135,8 +203,8 @@ config BUSYBOX_CONFIG_DU
du is used to report the amount of disk space used du is used to report the amount of disk space used
for specified files. for specified files.
config BUSYBOX_CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K config BUSYBOX_CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
bool " Use a default blocksize of 1024 bytes (1K)" bool "Use a default blocksize of 1024 bytes (1K)"
default y default y
depends on BUSYBOX_CONFIG_DU depends on BUSYBOX_CONFIG_DU
help help
@ -150,7 +218,7 @@ config BUSYBOX_CONFIG_ECHO
# this entry also appears in shell/Config.in, next to the echo builtin # this entry also appears in shell/Config.in, next to the echo builtin
config BUSYBOX_CONFIG_FEATURE_FANCY_ECHO config BUSYBOX_CONFIG_FEATURE_FANCY_ECHO
bool " Enable echo options (-n and -e)" bool "Enable echo options (-n and -e)"
default y default y
depends on BUSYBOX_CONFIG_ECHO depends on BUSYBOX_CONFIG_ECHO
help help
@ -164,6 +232,13 @@ config BUSYBOX_CONFIG_ENV
a command; without options it displays the current a command; without options it displays the current
environment. environment.
config BUSYBOX_CONFIG_FEATURE_ENV_LONG_OPTIONS
bool "Enable long options"
default n
depends on BUSYBOX_CONFIG_ENV && BUSYBOX_CONFIG_GETOPT_LONG
help
Support long options for the env applet.
config BUSYBOX_CONFIG_EXPR config BUSYBOX_CONFIG_EXPR
bool "expr" bool "expr"
default y default y
@ -172,7 +247,7 @@ config BUSYBOX_CONFIG_EXPR
to standard output. to standard output.
config BUSYBOX_CONFIG_EXPR_MATH_SUPPORT_64 config BUSYBOX_CONFIG_EXPR_MATH_SUPPORT_64
bool " Extend Posix numbers support to 64 bit" bool "Extend Posix numbers support to 64 bit"
default n default n
depends on BUSYBOX_CONFIG_EXPR depends on BUSYBOX_CONFIG_EXPR
help help
@ -200,7 +275,7 @@ config BUSYBOX_CONFIG_HEAD
from files. from files.
config BUSYBOX_CONFIG_FEATURE_FANCY_HEAD config BUSYBOX_CONFIG_FEATURE_FANCY_HEAD
bool " Enable head options (-c, -q, and -v)" bool "Enable head options (-c, -q, and -v)"
default y default y
depends on BUSYBOX_CONFIG_HEAD depends on BUSYBOX_CONFIG_HEAD
help help
@ -225,6 +300,13 @@ config BUSYBOX_CONFIG_INSTALL
help help
Copy files and set attributes. Copy files and set attributes.
config BUSYBOX_CONFIG_FEATURE_INSTALL_LONG_OPTIONS
bool "Enable long options"
default n
depends on BUSYBOX_CONFIG_INSTALL && BUSYBOX_CONFIG_GETOPT_LONG
help
Support long options for the install applet.
config BUSYBOX_CONFIG_LENGTH config BUSYBOX_CONFIG_LENGTH
bool "length" bool "length"
default y default y
@ -250,56 +332,56 @@ config BUSYBOX_CONFIG_LS
ls is used to list the contents of directories. ls is used to list the contents of directories.
config BUSYBOX_CONFIG_FEATURE_LS_FILETYPES config BUSYBOX_CONFIG_FEATURE_LS_FILETYPES
bool " Enable filetyping options (-p and -F)" bool "Enable filetyping options (-p and -F)"
default y default y
depends on BUSYBOX_CONFIG_LS depends on BUSYBOX_CONFIG_LS
help help
Enable the ls options (-p and -F). Enable the ls options (-p and -F).
config BUSYBOX_CONFIG_FEATURE_LS_FOLLOWLINKS config BUSYBOX_CONFIG_FEATURE_LS_FOLLOWLINKS
bool " Enable symlinks dereferencing (-L)" bool "Enable symlinks dereferencing (-L)"
default y default y
depends on BUSYBOX_CONFIG_LS depends on BUSYBOX_CONFIG_LS
help help
Enable the ls option (-L). Enable the ls option (-L).
config BUSYBOX_CONFIG_FEATURE_LS_RECURSIVE config BUSYBOX_CONFIG_FEATURE_LS_RECURSIVE
bool " Enable recursion (-R)" bool "Enable recursion (-R)"
default y default y
depends on BUSYBOX_CONFIG_LS depends on BUSYBOX_CONFIG_LS
help help
Enable the ls option (-R). Enable the ls option (-R).
config BUSYBOX_CONFIG_FEATURE_LS_SORTFILES config BUSYBOX_CONFIG_FEATURE_LS_SORTFILES
bool " Sort the file names" bool "Sort the file names"
default y default y
depends on BUSYBOX_CONFIG_LS depends on BUSYBOX_CONFIG_LS
help help
Allow ls to sort file names alphabetically. Allow ls to sort file names alphabetically.
config BUSYBOX_CONFIG_FEATURE_LS_TIMESTAMPS config BUSYBOX_CONFIG_FEATURE_LS_TIMESTAMPS
bool " Show file timestamps" bool "Show file timestamps"
default y default y
depends on BUSYBOX_CONFIG_LS depends on BUSYBOX_CONFIG_LS
help help
Allow ls to display timestamps for files. Allow ls to display timestamps for files.
config BUSYBOX_CONFIG_FEATURE_LS_USERNAME config BUSYBOX_CONFIG_FEATURE_LS_USERNAME
bool " Show username/groupnames" bool "Show username/groupnames"
default y default y
depends on BUSYBOX_CONFIG_LS depends on BUSYBOX_CONFIG_LS
help help
Allow ls to display username/groupname for files. Allow ls to display username/groupname for files.
config BUSYBOX_CONFIG_FEATURE_LS_COLOR config BUSYBOX_CONFIG_FEATURE_LS_COLOR
bool " Allow use of color to identify file types" bool "Allow use of color to identify file types"
default y default y
depends on BUSYBOX_CONFIG_LS depends on BUSYBOX_CONFIG_LS && BUSYBOX_CONFIG_GETOPT_LONG
help help
This enables the --color option to ls. This enables the --color option to ls.
config BUSYBOX_CONFIG_FEATURE_LS_COLOR_IS_DEFAULT config BUSYBOX_CONFIG_FEATURE_LS_COLOR_IS_DEFAULT
bool " Produce colored ls output by default" bool "Produce colored ls output by default"
default y default y
depends on BUSYBOX_CONFIG_FEATURE_LS_COLOR depends on BUSYBOX_CONFIG_FEATURE_LS_COLOR
help help
@ -321,6 +403,13 @@ config BUSYBOX_CONFIG_MKDIR
help help
mkdir is used to create directories with the specified names. mkdir is used to create directories with the specified names.
config BUSYBOX_CONFIG_FEATURE_MKDIR_LONG_OPTIONS
bool "Enable long options"
default n
depends on BUSYBOX_CONFIG_MKDIR && BUSYBOX_CONFIG_GETOPT_LONG
help
Support long options for the mkdir applet.
config BUSYBOX_CONFIG_MKFIFO config BUSYBOX_CONFIG_MKFIFO
bool "mkfifo" bool "mkfifo"
default y default y
@ -341,6 +430,13 @@ config BUSYBOX_CONFIG_MV
help help
mv is used to move or rename files or directories. mv is used to move or rename files or directories.
config BUSYBOX_CONFIG_FEATURE_MV_LONG_OPTIONS
bool "Enable long options"
default n
depends on BUSYBOX_CONFIG_MV && BUSYBOX_CONFIG_GETOPT_LONG
help
Support long options for the mv applet.
config BUSYBOX_CONFIG_NICE config BUSYBOX_CONFIG_NICE
bool "nice" bool "nice"
default n default n
@ -416,7 +512,7 @@ config BUSYBOX_CONFIG_SLEEP
sleep is used to pause for a specified number of seconds, sleep is used to pause for a specified number of seconds,
config BUSYBOX_CONFIG_FEATURE_FANCY_SLEEP config BUSYBOX_CONFIG_FEATURE_FANCY_SLEEP
bool " Enable multiple integer args and optional time suffixes" bool "Enable multiple integer args and optional time suffixes"
default y default y
depends on BUSYBOX_CONFIG_SLEEP depends on BUSYBOX_CONFIG_SLEEP
help help
@ -429,7 +525,7 @@ config BUSYBOX_CONFIG_SORT
sort is used to sort lines of text in specified files. sort is used to sort lines of text in specified files.
config BUSYBOX_CONFIG_FEATURE_SORT_BIG config BUSYBOX_CONFIG_FEATURE_SORT_BIG
bool " full SuSv3 compliant sort (Support -ktcsbdfiozgM)" bool "full SuSv3 compliant sort (Support -ktcsbdfiozgM)"
default n default n
depends on BUSYBOX_CONFIG_SORT depends on BUSYBOX_CONFIG_SORT
help help
@ -447,7 +543,7 @@ config BUSYBOX_CONFIG_STAT
display file or filesystem status. display file or filesystem status.
config BUSYBOX_CONFIG_FEATURE_STAT_FORMAT config BUSYBOX_CONFIG_FEATURE_STAT_FORMAT
bool " Enable custom formats (-c)" bool "Enable custom formats (-c)"
default n default n
depends on BUSYBOX_CONFIG_STAT depends on BUSYBOX_CONFIG_STAT
help help
@ -481,7 +577,7 @@ config BUSYBOX_CONFIG_TAIL
from files. from files.
config BUSYBOX_CONFIG_FEATURE_FANCY_TAIL config BUSYBOX_CONFIG_FEATURE_FANCY_TAIL
bool " Enable extra tail options (-q, -s, and -v)" bool "Enable extra tail options (-q, -s, and -v)"
default y default y
depends on BUSYBOX_CONFIG_TAIL depends on BUSYBOX_CONFIG_TAIL
help help
@ -496,7 +592,7 @@ config BUSYBOX_CONFIG_TEE
to standard output and files. to standard output and files.
config BUSYBOX_CONFIG_FEATURE_TEE_USE_BLOCK_IO config BUSYBOX_CONFIG_FEATURE_TEE_USE_BLOCK_IO
bool " Enable block i/o (larger/faster) instead of byte i/o." bool "Enable block i/o (larger/faster) instead of byte i/o."
default y default y
depends on BUSYBOX_CONFIG_TEE depends on BUSYBOX_CONFIG_TEE
help help
@ -507,11 +603,11 @@ config BUSYBOX_CONFIG_TEST
default y default y
help help
test is used to check file types and compare values, test is used to check file types and compare values,
returning an appropriate exit code. The shells (ash returning an appropriate exit code. The bash shell
and bash) have test builtin. has test built in, ash can build it in optionally.
config BUSYBOX_CONFIG_FEATURE_TEST_64 config BUSYBOX_CONFIG_FEATURE_TEST_64
bool " Extend test to 64 bit" bool "Extend test to 64 bit"
default n default n
depends on BUSYBOX_CONFIG_TEST depends on BUSYBOX_CONFIG_TEST
help help
@ -532,7 +628,7 @@ config BUSYBOX_CONFIG_TR
input, writing to standard output. input, writing to standard output.
config BUSYBOX_CONFIG_FEATURE_TR_CLASSES config BUSYBOX_CONFIG_FEATURE_TR_CLASSES
bool " Enable character classes (such as [:upper:])" bool "Enable character classes (such as [:upper:])"
default n default n
depends on BUSYBOX_CONFIG_TR depends on BUSYBOX_CONFIG_TR
help help
@ -540,7 +636,7 @@ config BUSYBOX_CONFIG_FEATURE_TR_CLASSES
tr [:upper:] [:lower:] to convert input into lowercase. tr [:upper:] [:lower:] to convert input into lowercase.
config BUSYBOX_CONFIG_FEATURE_TR_EQUIV config BUSYBOX_CONFIG_FEATURE_TR_EQUIV
bool " Enable equivalence classes" bool "Enable equivalence classes"
default n default n
depends on BUSYBOX_CONFIG_TR depends on BUSYBOX_CONFIG_TR
help help
@ -633,7 +729,7 @@ comment "Common options for cp and mv"
depends on BUSYBOX_CONFIG_CP || BUSYBOX_CONFIG_MV depends on BUSYBOX_CONFIG_CP || BUSYBOX_CONFIG_MV
config BUSYBOX_CONFIG_FEATURE_PRESERVE_HARDLINKS config BUSYBOX_CONFIG_FEATURE_PRESERVE_HARDLINKS
bool " Preserve hard links" bool "Preserve hard links"
default y default y
depends on BUSYBOX_CONFIG_CP || BUSYBOX_CONFIG_MV depends on BUSYBOX_CONFIG_CP || BUSYBOX_CONFIG_MV
help help
@ -643,7 +739,7 @@ comment "Common options for ls, more and telnet"
depends on BUSYBOX_CONFIG_LS || BUSYBOX_CONFIG_MORE || BUSYBOX_CONFIG_TELNET depends on BUSYBOX_CONFIG_LS || BUSYBOX_CONFIG_MORE || BUSYBOX_CONFIG_TELNET
config BUSYBOX_CONFIG_FEATURE_AUTOWIDTH config BUSYBOX_CONFIG_FEATURE_AUTOWIDTH
bool " Calculate terminal & column widths" bool "Calculate terminal & column widths"
default y default y
depends on BUSYBOX_CONFIG_LS || BUSYBOX_CONFIG_MORE || BUSYBOX_CONFIG_TELNET depends on BUSYBOX_CONFIG_LS || BUSYBOX_CONFIG_MORE || BUSYBOX_CONFIG_TELNET
help help
@ -657,7 +753,7 @@ comment "Common options for df, du, ls"
depends on BUSYBOX_CONFIG_DF || BUSYBOX_CONFIG_DU || BUSYBOX_CONFIG_LS depends on BUSYBOX_CONFIG_DF || BUSYBOX_CONFIG_DU || BUSYBOX_CONFIG_LS
config BUSYBOX_CONFIG_FEATURE_HUMAN_READABLE config BUSYBOX_CONFIG_FEATURE_HUMAN_READABLE
bool " Support for human readable output (example 13k, 23M, 235G)" bool "Support for human readable output (example 13k, 23M, 235G)"
default y default y
depends on BUSYBOX_CONFIG_DF || BUSYBOX_CONFIG_DU || BUSYBOX_CONFIG_LS depends on BUSYBOX_CONFIG_DF || BUSYBOX_CONFIG_DU || BUSYBOX_CONFIG_LS
help help
@ -667,7 +763,7 @@ comment "Common options for md5sum, sha1sum"
depends on BUSYBOX_CONFIG_MD5SUM || BUSYBOX_CONFIG_SHA1SUM depends on BUSYBOX_CONFIG_MD5SUM || BUSYBOX_CONFIG_SHA1SUM
config BUSYBOX_CONFIG_FEATURE_MD5_SHA1_SUM_CHECK config BUSYBOX_CONFIG_FEATURE_MD5_SHA1_SUM_CHECK
bool " Enable -c, -s and -w options" bool "Enable -c, -s and -w options"
default y default y
depends on BUSYBOX_CONFIG_MD5SUM || BUSYBOX_CONFIG_SHA1SUM depends on BUSYBOX_CONFIG_MD5SUM || BUSYBOX_CONFIG_SHA1SUM
help help

View File

@ -25,7 +25,7 @@ config BUSYBOX_CONFIG_READLINK
of the file it points to of the file it points to
config BUSYBOX_CONFIG_FEATURE_READLINK_FOLLOW config BUSYBOX_CONFIG_FEATURE_READLINK_FOLLOW
bool " Enable canonicalization by following all symlinks (-f)" bool "Enable canonicalization by following all symlinks (-f)"
default n default n
depends on BUSYBOX_CONFIG_READLINK depends on BUSYBOX_CONFIG_READLINK
help help
@ -46,6 +46,13 @@ config BUSYBOX_CONFIG_RUN_PARTS
Unless you know that run-parts is used in some of your scripts Unless you know that run-parts is used in some of your scripts
you can safely say N here. you can safely say N here.
config BUSYBOX_CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS
bool "Enable long options"
default n
depends on BUSYBOX_CONFIG_RUN_PARTS && BUSYBOX_CONFIG_GETOPT_LONG
help
Support long options for the run-parts applet.
config BUSYBOX_CONFIG_START_STOP_DAEMON config BUSYBOX_CONFIG_START_STOP_DAEMON
bool "start-stop-daemon" bool "start-stop-daemon"
default n default n
@ -54,6 +61,22 @@ config BUSYBOX_CONFIG_START_STOP_DAEMON
termination of system-level processes, usually the ones termination of system-level processes, usually the ones
started during the startup of the system. started during the startup of the system.
config BUSYBOX_CONFIG_FEATURE_START_STOP_DAEMON_FANCY
bool "Support additional arguments"
default n
depends on BUSYBOX_CONFIG_START_STOP_DAEMON
help
Support additional arguments.
-o|--oknodo ignored since we exit with 0 anyway
-v|--verbose
config BUSYBOX_CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS
bool "Enable long options"
default n
depends on BUSYBOX_CONFIG_START_STOP_DAEMON && BUSYBOX_CONFIG_GETOPT_LONG
help
Support long options for the start-stop-daemon applet.
config BUSYBOX_CONFIG_WHICH config BUSYBOX_CONFIG_WHICH
bool "which" bool "which"
default y default y

View File

@ -13,13 +13,21 @@ config BUSYBOX_CONFIG_AWK
the BusyBox implementation of that programming language. the BusyBox implementation of that programming language.
config BUSYBOX_CONFIG_FEATURE_AWK_MATH config BUSYBOX_CONFIG_FEATURE_AWK_MATH
bool " Enable math functions (requires libm)" bool "Enable math functions (requires libm)"
default y default y
depends on BUSYBOX_CONFIG_AWK depends on BUSYBOX_CONFIG_AWK
help help
Enable math functions of the Awk programming language. Enable math functions of the Awk programming language.
NOTE: This will require libm to be present for linking. NOTE: This will require libm to be present for linking.
config BUSYBOX_CONFIG_ED
bool "ed"
default n
help
The original 1970's Unix text editor, from the days of teletypes.
Small, simple, evil. Part of SUSv3. If you're not already using
this, you don't need it.
config BUSYBOX_CONFIG_PATCH config BUSYBOX_CONFIG_PATCH
bool "patch" bool "patch"
default n default n
@ -43,7 +51,7 @@ config BUSYBOX_CONFIG_VI
you may wish to use something else. you may wish to use something else.
config BUSYBOX_CONFIG_FEATURE_VI_COLON config BUSYBOX_CONFIG_FEATURE_VI_COLON
bool " Enable \":\" colon commands (no \"ex\" mode)" bool "Enable \":\" colon commands (no \"ex\" mode)"
default y default y
depends on BUSYBOX_CONFIG_VI depends on BUSYBOX_CONFIG_VI
help help
@ -51,7 +59,7 @@ config BUSYBOX_CONFIG_FEATURE_VI_COLON
provide an "ex" mode. provide an "ex" mode.
config BUSYBOX_CONFIG_FEATURE_VI_YANKMARK config BUSYBOX_CONFIG_FEATURE_VI_YANKMARK
bool " Enable yank/put commands and mark cmds" bool "Enable yank/put commands and mark cmds"
default y default y
depends on BUSYBOX_CONFIG_VI depends on BUSYBOX_CONFIG_VI
help help
@ -59,7 +67,7 @@ config BUSYBOX_CONFIG_FEATURE_VI_YANKMARK
busybox vi. busybox vi.
config BUSYBOX_CONFIG_FEATURE_VI_SEARCH config BUSYBOX_CONFIG_FEATURE_VI_SEARCH
bool " Enable search and replace cmds" bool "Enable search and replace cmds"
default y default y
depends on BUSYBOX_CONFIG_VI depends on BUSYBOX_CONFIG_VI
help help
@ -67,7 +75,7 @@ config BUSYBOX_CONFIG_FEATURE_VI_SEARCH
busybox vi. busybox vi.
config BUSYBOX_CONFIG_FEATURE_VI_USE_SIGNALS config BUSYBOX_CONFIG_FEATURE_VI_USE_SIGNALS
bool " Catch signals" bool "Catch signals"
default y default y
depends on BUSYBOX_CONFIG_VI depends on BUSYBOX_CONFIG_VI
help help
@ -76,14 +84,14 @@ config BUSYBOX_CONFIG_FEATURE_VI_USE_SIGNALS
Ctrl-Z and Ctrl-C and alarms. Ctrl-Z and Ctrl-C and alarms.
config BUSYBOX_CONFIG_FEATURE_VI_DOT_CMD config BUSYBOX_CONFIG_FEATURE_VI_DOT_CMD
bool " Remember previous cmd and \".\" cmd" bool "Remember previous cmd and \".\" cmd"
default y default y
depends on BUSYBOX_CONFIG_VI depends on BUSYBOX_CONFIG_VI
help help
Make busybox vi remember the last command and be able to repeat it. Make busybox vi remember the last command and be able to repeat it.
config BUSYBOX_CONFIG_FEATURE_VI_READONLY config BUSYBOX_CONFIG_FEATURE_VI_READONLY
bool " Enable -R option and \"view\" mode" bool "Enable -R option and \"view\" mode"
default y default y
depends on BUSYBOX_CONFIG_VI depends on BUSYBOX_CONFIG_VI
help help
@ -91,28 +99,28 @@ config BUSYBOX_CONFIG_FEATURE_VI_READONLY
open a file in read-only mode. open a file in read-only mode.
config BUSYBOX_CONFIG_FEATURE_VI_SETOPTS config BUSYBOX_CONFIG_FEATURE_VI_SETOPTS
bool " Enable set-able options, ai ic showmatch" bool "Enable set-able options, ai ic showmatch"
default y default y
depends on BUSYBOX_CONFIG_VI depends on BUSYBOX_CONFIG_VI
help help
Enable the editor to set some (ai, ic, showmatch) options. Enable the editor to set some (ai, ic, showmatch) options.
config BUSYBOX_CONFIG_FEATURE_VI_SET config BUSYBOX_CONFIG_FEATURE_VI_SET
bool " Support for :set" bool "Support for :set"
default y default y
depends on BUSYBOX_CONFIG_VI depends on BUSYBOX_CONFIG_VI
help help
Support for ":set". Support for ":set".
config BUSYBOX_CONFIG_FEATURE_VI_WIN_RESIZE config BUSYBOX_CONFIG_FEATURE_VI_WIN_RESIZE
bool " Handle window resize" bool "Handle window resize"
default y default y
depends on BUSYBOX_CONFIG_VI depends on BUSYBOX_CONFIG_VI
help help
Make busybox vi behave nicely with terminals that get resized. Make busybox vi behave nicely with terminals that get resized.
config BUSYBOX_CONFIG_FEATURE_VI_OPTIMIZE_CURSOR config BUSYBOX_CONFIG_FEATURE_VI_OPTIMIZE_CURSOR
bool " Optimize cursor movement" bool "Optimize cursor movement"
default y default y
depends on BUSYBOX_CONFIG_VI depends on BUSYBOX_CONFIG_VI
help help

View File

@ -11,8 +11,18 @@ config BUSYBOX_CONFIG_FIND
help help
find is used to search your system to find specified files. find is used to search your system to find specified files.
config BUSYBOX_CONFIG_FEATURE_FIND_PRINT0
bool "Enable -print0 option"
default y
depends on BUSYBOX_CONFIG_FIND
help
Causes output names to be separated by a null character
rather than a newline. This allows names that contain
newlines and other whitespace to be more easily
interpreted by other programs.
config BUSYBOX_CONFIG_FEATURE_FIND_MTIME config BUSYBOX_CONFIG_FEATURE_FIND_MTIME
bool " Enable modified time matching (-mtime) option" bool "Enable modified time matching (-mtime) option"
default n default n
depends on BUSYBOX_CONFIG_FIND depends on BUSYBOX_CONFIG_FIND
help help
@ -20,7 +30,7 @@ config BUSYBOX_CONFIG_FEATURE_FIND_MTIME
files, in days. files, in days.
config BUSYBOX_CONFIG_FEATURE_FIND_MMIN config BUSYBOX_CONFIG_FEATURE_FIND_MMIN
bool " Enable modified time matching (-min) option" bool "Enable modified time matching (-min) option"
default n default n
depends on BUSYBOX_CONFIG_FIND depends on BUSYBOX_CONFIG_FIND
help help
@ -28,14 +38,14 @@ config BUSYBOX_CONFIG_FEATURE_FIND_MMIN
files, in minutes. files, in minutes.
config BUSYBOX_CONFIG_FEATURE_FIND_PERM config BUSYBOX_CONFIG_FEATURE_FIND_PERM
bool " Enable permissions matching (-perm) option" bool "Enable permissions matching (-perm) option"
default y default y
depends on BUSYBOX_CONFIG_FIND depends on BUSYBOX_CONFIG_FIND
help help
Enable searching based on file permissions. Enable searching based on file permissions.
config BUSYBOX_CONFIG_FEATURE_FIND_TYPE config BUSYBOX_CONFIG_FEATURE_FIND_TYPE
bool " Enable filetype matching (-type) option" bool "Enable filetype matching (-type) option"
default y default y
depends on BUSYBOX_CONFIG_FIND depends on BUSYBOX_CONFIG_FIND
help help
@ -43,7 +53,7 @@ config BUSYBOX_CONFIG_FEATURE_FIND_TYPE
directory, socket, device, etc.). directory, socket, device, etc.).
config BUSYBOX_CONFIG_FEATURE_FIND_XDEV config BUSYBOX_CONFIG_FEATURE_FIND_XDEV
bool " Enable stay in filesystem (-xdev) option" bool "Enable stay in filesystem (-xdev) option"
default y default y
depends on BUSYBOX_CONFIG_FIND depends on BUSYBOX_CONFIG_FIND
help help
@ -51,7 +61,7 @@ config BUSYBOX_CONFIG_FEATURE_FIND_XDEV
filesystem. filesystem.
config BUSYBOX_CONFIG_FEATURE_FIND_NEWER config BUSYBOX_CONFIG_FEATURE_FIND_NEWER
bool " Enable -newer option for comparing file mtimes" bool "Enable -newer option for comparing file mtimes"
default n default n
depends on BUSYBOX_CONFIG_FIND depends on BUSYBOX_CONFIG_FIND
help help
@ -59,14 +69,14 @@ config BUSYBOX_CONFIG_FEATURE_FIND_NEWER
a modified time that is more recent than the specified FILE. a modified time that is more recent than the specified FILE.
config BUSYBOX_CONFIG_FEATURE_FIND_INUM config BUSYBOX_CONFIG_FEATURE_FIND_INUM
bool " Enable inode number matching (-inum) option" bool "Enable inode number matching (-inum) option"
default n default n
depends on BUSYBOX_CONFIG_FIND depends on BUSYBOX_CONFIG_FIND
help help
Support the 'find -inum' option for searching by inode number. Support the 'find -inum' option for searching by inode number.
config BUSYBOX_CONFIG_FEATURE_FIND_EXEC config BUSYBOX_CONFIG_FEATURE_FIND_EXEC
bool " Enable (-exec) option allowing execution of commands" bool "Enable (-exec) option allowing execution of commands"
default y default y
depends on BUSYBOX_CONFIG_FIND depends on BUSYBOX_CONFIG_FIND
help help
@ -80,7 +90,7 @@ config BUSYBOX_CONFIG_GREP
grep is used to search files for a specified pattern. grep is used to search files for a specified pattern.
config BUSYBOX_CONFIG_FEATURE_GREP_EGREP_ALIAS config BUSYBOX_CONFIG_FEATURE_GREP_EGREP_ALIAS
bool " Support extended regular expressions (egrep & grep -E)" bool "Support extended regular expressions (egrep & grep -E)"
default y default y
depends on BUSYBOX_CONFIG_GREP depends on BUSYBOX_CONFIG_GREP
help help
@ -89,7 +99,7 @@ config BUSYBOX_CONFIG_FEATURE_GREP_EGREP_ALIAS
and various repetition operators. and various repetition operators.
config BUSYBOX_CONFIG_FEATURE_GREP_FGREP_ALIAS config BUSYBOX_CONFIG_FEATURE_GREP_FGREP_ALIAS
bool " Alias fgrep to grep -F" bool "Alias fgrep to grep -F"
default y default y
depends on BUSYBOX_CONFIG_GREP depends on BUSYBOX_CONFIG_GREP
help help
@ -98,7 +108,7 @@ config BUSYBOX_CONFIG_FEATURE_GREP_FGREP_ALIAS
grep -F is always builtin, this just creates the fgrep alias. grep -F is always builtin, this just creates the fgrep alias.
config BUSYBOX_CONFIG_FEATURE_GREP_CONTEXT config BUSYBOX_CONFIG_FEATURE_GREP_CONTEXT
bool " Enable before and after context flags (-A, -B and -C)" bool "Enable before and after context flags (-A, -B and -C)"
default y default y
depends on BUSYBOX_CONFIG_GREP depends on BUSYBOX_CONFIG_GREP
help help
@ -114,7 +124,7 @@ config BUSYBOX_CONFIG_XARGS
every item from standard input. every item from standard input.
config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION
bool " Enable prompt and confirmation option -p" bool "Enable prompt and confirmation option -p"
default y default y
depends on BUSYBOX_CONFIG_XARGS depends on BUSYBOX_CONFIG_XARGS
help help
@ -122,7 +132,7 @@ config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION
line and read a line from the terminal. line and read a line from the terminal.
config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_QUOTES config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_QUOTES
bool " Enable support single and double quotes and backslash" bool "Enable support single and double quotes and backslash"
default y default y
depends on BUSYBOX_CONFIG_XARGS depends on BUSYBOX_CONFIG_XARGS
help help
@ -130,7 +140,7 @@ config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_QUOTES
and backslash for can use aruments with spaces. and backslash for can use aruments with spaces.
config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT
bool " Enable support options -x" bool "Enable support options -x"
default y default y
depends on BUSYBOX_CONFIG_XARGS depends on BUSYBOX_CONFIG_XARGS
help help
@ -138,7 +148,7 @@ config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT
is exceeded. is exceeded.
config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM
bool " Enable options -0" bool "Enable options -0"
default y default y
depends on BUSYBOX_CONFIG_XARGS depends on BUSYBOX_CONFIG_XARGS
help help

View File

@ -11,15 +11,23 @@ config BUSYBOX_CONFIG_INIT
help help
init is the first program run when the system boots. init is the first program run when the system boots.
config BUSYBOX_CONFIG_DEBUG_INIT
bool "debugging aid"
default n
depends on BUSYBOX_CONFIG_INIT
help
Turn this on to disable all the dangerous
rebooting stuff when debugging.
config BUSYBOX_CONFIG_FEATURE_USE_INITTAB config BUSYBOX_CONFIG_FEATURE_USE_INITTAB
bool " Support reading an inittab file" bool "Support reading an inittab file"
default y default y
depends on BUSYBOX_CONFIG_INIT depends on BUSYBOX_CONFIG_INIT
help help
Allow init to read an inittab file when the system boot. Allow init to read an inittab file when the system boot.
config BUSYBOX_CONFIG_FEATURE_INIT_SCTTY config BUSYBOX_CONFIG_FEATURE_INIT_SCTTY
bool " Support running commands with a controlling-tty" bool "Support running commands with a controlling-tty"
default n default n
depends on BUSYBOX_CONFIG_INIT depends on BUSYBOX_CONFIG_INIT
help help
@ -30,14 +38,14 @@ config BUSYBOX_CONFIG_FEATURE_INIT_SCTTY
the console is only accessed during development or for maintenance. the console is only accessed during development or for maintenance.
config BUSYBOX_CONFIG_FEATURE_EXTRA_QUIET config BUSYBOX_CONFIG_FEATURE_EXTRA_QUIET
bool " Be _extra_ quiet on boot" bool "Be _extra_ quiet on boot"
default n default n
depends on BUSYBOX_CONFIG_INIT depends on BUSYBOX_CONFIG_INIT
help help
Prevent init from logging some messages to the console during boot. Prevent init from logging some messages to the console during boot.
config BUSYBOX_CONFIG_FEATURE_INIT_COREDUMPS config BUSYBOX_CONFIG_FEATURE_INIT_COREDUMPS
bool " Support dumping core for child processes (debugging only)" bool "Support dumping core for child processes (debugging only)"
default n default n
depends on BUSYBOX_CONFIG_INIT depends on BUSYBOX_CONFIG_INIT
help help
@ -49,7 +57,7 @@ config BUSYBOX_CONFIG_FEATURE_INIT_COREDUMPS
config BUSYBOX_CONFIG_FEATURE_INITRD config BUSYBOX_CONFIG_FEATURE_INITRD
bool " Support running init from within an initrd (not initramfs)" bool "Support running init from within an initrd (not initramfs)"
default n default n
depends on BUSYBOX_CONFIG_INIT depends on BUSYBOX_CONFIG_INIT
help help
@ -72,9 +80,4 @@ config BUSYBOX_CONFIG_MESG
Mesg controls access to your terminal by others. It is typically Mesg controls access to your terminal by others. It is typically
used to allow or disallow other users to write to your terminal used to allow or disallow other users to write to your terminal
default y
help
Stop all processes and (try to) power off the system.
endmenu endmenu

View File

@ -84,14 +84,14 @@ config BUSYBOX_CONFIG_GETTY
getty lets you log in on a tty, it is normally invoked by init. getty lets you log in on a tty, it is normally invoked by init.
config BUSYBOX_CONFIG_FEATURE_UTMP config BUSYBOX_CONFIG_FEATURE_UTMP
bool " Support utmp file" bool "Support utmp file"
depends on BUSYBOX_CONFIG_GETTY || BUSYBOX_CONFIG_LOGIN || BUSYBOX_CONFIG_SU || BUSYBOX_CONFIG_WHO depends on BUSYBOX_CONFIG_GETTY || BUSYBOX_CONFIG_LOGIN || BUSYBOX_CONFIG_SU || BUSYBOX_CONFIG_WHO
default n default n
help help
The file /var/run/utmp is used to track who is currently logged in. The file /var/run/utmp is used to track who is currently logged in.
config BUSYBOX_CONFIG_FEATURE_WTMP config BUSYBOX_CONFIG_FEATURE_WTMP
bool " Support wtmp file" bool "Support wtmp file"
depends on BUSYBOX_CONFIG_GETTY || BUSYBOX_CONFIG_LOGIN || BUSYBOX_CONFIG_SU || BUSYBOX_CONFIG_LAST depends on BUSYBOX_CONFIG_GETTY || BUSYBOX_CONFIG_LOGIN || BUSYBOX_CONFIG_SU || BUSYBOX_CONFIG_LAST
default n default n
select BUSYBOX_CONFIG_FEATURE_UTMP select BUSYBOX_CONFIG_FEATURE_UTMP
@ -110,7 +110,7 @@ config BUSYBOX_CONFIG_LOGIN
work properly. work properly.
config BUSYBOX_CONFIG_FEATURE_SECURETTY config BUSYBOX_CONFIG_FEATURE_SECURETTY
bool " Support for /etc/securetty" bool "Support for /etc/securetty"
default n default n
depends on BUSYBOX_CONFIG_LOGIN depends on BUSYBOX_CONFIG_LOGIN
help help

View File

@ -34,8 +34,15 @@ config BUSYBOX_CONFIG_CROND
Note that Busybox binary must be setuid root for this applet to Note that Busybox binary must be setuid root for this applet to
work properly. work properly.
config BUSYBOX_CONFIG_DEBUG_CROND_OPTION
bool "Support debug option -d"
depends on BUSYBOX_CONFIG_CROND
default n
help
Support option -d to enter debug mode.
config BUSYBOX_CONFIG_FEATURE_CROND_CALL_SENDMAIL config BUSYBOX_CONFIG_FEATURE_CROND_CALL_SENDMAIL
bool " Using /usr/sbin/sendmail?" bool "Using /usr/sbin/sendmail?"
default n default n
depends on BUSYBOX_CONFIG_CROND depends on BUSYBOX_CONFIG_CROND
help help
@ -57,9 +64,11 @@ config BUSYBOX_CONFIG_DC
precision arithmetic. precision arithmetic.
config BUSYBOX_CONFIG_DEVFSD config BUSYBOX_CONFIG_DEVFSD
bool "devfsd" bool "devfsd (obsolete)"
default n default n
help help
This is deprecated, and will be going away in a future release.
Provides compatibility with old device names on a devfs systems. Provides compatibility with old device names on a devfs systems.
You should set it to true if you have devfs enabled. You should set it to true if you have devfs enabled.
The following keywords in devsfd.conf are supported: The following keywords in devsfd.conf are supported:
@ -74,7 +83,8 @@ config BUSYBOX_CONFIG_DEVFSD_MODLOAD
default n default n
depends on BUSYBOX_CONFIG_DEVFSD depends on BUSYBOX_CONFIG_DEVFSD
help help
This actually doesn't work with busybox modutils but needs the real modutils. This actually doesn't work with busybox modutils but needs
the external modutils.
config BUSYBOX_CONFIG_DEVFSD_FG_NP config BUSYBOX_CONFIG_DEVFSD_FG_NP
bool "Enables the -fg and -np options" bool "Enables the -fg and -np options"
@ -91,6 +101,17 @@ config BUSYBOX_CONFIG_DEVFSD_VERBOSE
help help
Increases logging to stderr or syslog. Increases logging to stderr or syslog.
config BUSYBOX_CONFIG_FEATURE_DEVFS
bool " Use devfs names for all devices (obsolete)"
default y
help
This tells busybox to look for names like /dev/loop/0 instead of
/dev/loop0. If your /dev directory has normal names instead of
devfs names, you don't want this.
This is obsolete and will be going away someday. Consider it
deprecated.
config BUSYBOX_CONFIG_EJECT config BUSYBOX_CONFIG_EJECT
bool "eject" bool "eject"
default n default n
@ -112,7 +133,7 @@ config BUSYBOX_CONFIG_LESS
a wide array of features, and is an improvement over 'more'. a wide array of features, and is an improvement over 'more'.
config BUSYBOX_CONFIG_FEATURE_LESS_BRACKETS config BUSYBOX_CONFIG_FEATURE_LESS_BRACKETS
bool " Enable bracket searching" bool "Enable bracket searching"
default n default n
depends on BUSYBOX_CONFIG_LESS depends on BUSYBOX_CONFIG_LESS
help help
@ -120,7 +141,7 @@ config BUSYBOX_CONFIG_FEATURE_LESS_BRACKETS
brackets, facilitating programming. brackets, facilitating programming.
config BUSYBOX_CONFIG_FEATURE_LESS_FLAGS config BUSYBOX_CONFIG_FEATURE_LESS_FLAGS
bool " Enable extra flags" bool "Enable extra flags"
default n default n
depends on BUSYBOX_CONFIG_LESS depends on BUSYBOX_CONFIG_LESS
help help
@ -130,7 +151,7 @@ config BUSYBOX_CONFIG_FEATURE_LESS_FLAGS
The -m flag enables a simpler status line with a percentage. The -m flag enables a simpler status line with a percentage.
config BUSYBOX_CONFIG_FEATURE_LESS_FLAGCS config BUSYBOX_CONFIG_FEATURE_LESS_FLAGCS
bool " Enable flag changes" bool "Enable flag changes"
default n default n
depends on BUSYBOX_CONFIG_LESS depends on BUSYBOX_CONFIG_LESS
help help
@ -138,14 +159,14 @@ config BUSYBOX_CONFIG_FEATURE_LESS_FLAGCS
less itself. less itself.
config BUSYBOX_CONFIG_FEATURE_LESS_MARKS config BUSYBOX_CONFIG_FEATURE_LESS_MARKS
bool " Enable marks" bool "Enable marks"
default n default n
depends on BUSYBOX_CONFIG_LESS depends on BUSYBOX_CONFIG_LESS
help help
Marks enable positions in a file to be stored for easy reference. Marks enable positions in a file to be stored for easy reference.
config BUSYBOX_CONFIG_FEATURE_LESS_REGEXP config BUSYBOX_CONFIG_FEATURE_LESS_REGEXP
bool " Enable regular expressions" bool "Enable regular expressions"
default n default n
depends on BUSYBOX_CONFIG_LESS depends on BUSYBOX_CONFIG_LESS
help help
@ -160,16 +181,17 @@ config BUSYBOX_CONFIG_HDPARM
BUSYBOX_CONFIG_FEATURE_HDPARM_GET_IDENTITY option).... BUSYBOX_CONFIG_FEATURE_HDPARM_GET_IDENTITY option)....
config BUSYBOX_CONFIG_FEATURE_HDPARM_GET_IDENTITY config BUSYBOX_CONFIG_FEATURE_HDPARM_GET_IDENTITY
bool " Support obtaining detailed information directly from drives" bool "Support obtaining detailed information directly from drives"
default n default n
depends on BUSYBOX_CONFIG_HDPARM depends on BUSYBOX_CONFIG_HDPARM
help help
Enables the -I and -Istdin options to obtain detailed information Enables the -I and -i options to obtain detailed information
directly from drives about their capabilities and supported ATA directly from drives about their capabilities and supported ATA
feature set. Enabling this option will add about 16k... feature set. If no device name is specified, hdparm will read
identify data from stdin. Enabling this option will add about 16k...
config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF
bool " Register an IDE interface (DANGEROUS)" bool "Register an IDE interface (DANGEROUS)"
default n default n
depends on BUSYBOX_CONFIG_HDPARM depends on BUSYBOX_CONFIG_HDPARM
help help
@ -177,7 +199,7 @@ config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF
This is dangerous stuff, so you should probably say N. This is dangerous stuff, so you should probably say N.
config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
bool " Un-register an IDE interface (DANGEROUS)" bool "Un-register an IDE interface (DANGEROUS)"
default n default n
depends on BUSYBOX_CONFIG_HDPARM depends on BUSYBOX_CONFIG_HDPARM
help help
@ -185,7 +207,7 @@ config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
This is dangerous stuff, so you should probably say N. This is dangerous stuff, so you should probably say N.
config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET
bool " perform device reset (DANGEROUS)" bool "perform device reset (DANGEROUS)"
default n default n
depends on BUSYBOX_CONFIG_HDPARM depends on BUSYBOX_CONFIG_HDPARM
help help
@ -193,7 +215,7 @@ config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET
This is dangerous stuff, so you should probably say N. This is dangerous stuff, so you should probably say N.
config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
bool " tristate device for hotswap (DANGEROUS)" bool "tristate device for hotswap (DANGEROUS)"
default n default n
depends on BUSYBOX_CONFIG_HDPARM depends on BUSYBOX_CONFIG_HDPARM
help help
@ -202,7 +224,7 @@ config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
stuff, so you should probably say N. stuff, so you should probably say N.
config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA
bool " get/set using_dma flag (DANGEROUS)" bool "get/set using_dma flag (DANGEROUS)"
default n default n
depends on BUSYBOX_CONFIG_HDPARM depends on BUSYBOX_CONFIG_HDPARM
help help
@ -231,7 +253,7 @@ config BUSYBOX_CONFIG_MAKEDEVS
Device properties are passed as command line arguments. Device properties are passed as command line arguments.
. .
'table' reads device properties from a file or stdin, allowing 'table' reads device properties from a file or stdin, allowing
a batch of unrelated devices to be makde with one command. a batch of unrelated devices to be made with one command.
User/group names are allowed as an alternative to uid/gid. User/group names are allowed as an alternative to uid/gid.
choice choice
@ -289,6 +311,18 @@ config BUSYBOX_CONFIG_SETSID
help help
setsid runs a program in a new session setsid runs a program in a new session
config BUSYBOX_CONFIG_TASKSET
bool "taskset"
default n
help
Retrieve or set a processes's CPU affinity
config BUSYBOX_CONFIG_TASKSET
bool "taskset"
default n
help
Retrieve or set a processes's CPU affinity (on linux)
config BUSYBOX_CONFIG_TIME config BUSYBOX_CONFIG_TIME
bool "time" bool "time"
default y default y

View File

@ -84,7 +84,7 @@ config BUSYBOX_CONFIG_MODPROBE
bool "modprobe" bool "modprobe"
default n default n
help help
Handle the loading of modules, and their dependancies on a high Handle the loading of modules, and their dependencies on a high
level. level.
Note that in the state, modprobe does not understand multiple Note that in the state, modprobe does not understand multiple
@ -111,7 +111,7 @@ comment "Options common to multiple modutils"
config BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE config BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE
# Simulate indentation # Simulate indentation
bool " Support tainted module checking with new kernels" bool "Support tainted module checking with new kernels"
default n default n
depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_LSMOD depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_LSMOD
help help
@ -122,7 +122,7 @@ config BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE
config BUSYBOX_CONFIG_FEATURE_2_4_MODULES config BUSYBOX_CONFIG_FEATURE_2_4_MODULES
# Simulate indentation # Simulate indentation
bool " Support version 2.2.x to 2.4.x Linux kernels" bool "Support version 2.2.x to 2.4.x Linux kernels"
default y default y
depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_RMMOD depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_RMMOD
help help
@ -130,7 +130,7 @@ config BUSYBOX_CONFIG_FEATURE_2_4_MODULES
config BUSYBOX_CONFIG_FEATURE_2_6_MODULES config BUSYBOX_CONFIG_FEATURE_2_6_MODULES
# Simulate indentation # Simulate indentation
bool " Support version 2.6.x Linux kernels" bool "Support version 2.6.x Linux kernels"
default y default y
depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_RMMOD || BUSYBOX_CONFIG_MODPROBE depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_RMMOD || BUSYBOX_CONFIG_MODPROBE
help help

View File

@ -9,8 +9,8 @@ config BUSYBOX_CONFIG_FEATURE_IPV6
bool "Enable IPv6 support" bool "Enable IPv6 support"
default y default y
help help
Enable IPv6 support to busybox. This makes applets that talk IP Enable IPv6 support in busybox.
able to work with IPv6. This adds IPv6 support in the networking applets.
config BUSYBOX_CONFIG_ARPING config BUSYBOX_CONFIG_ARPING
bool "arping" bool "arping"
@ -22,7 +22,7 @@ config BUSYBOX_CONFIG_DNSD
bool "dnsd" bool "dnsd"
default n default n
help help
Small and static DNS server deamon. Small and static DNS server daemon.
config BUSYBOX_CONFIG_ETHER_WAKE config BUSYBOX_CONFIG_ETHER_WAKE
bool "ether-wake" bool "ether-wake"
@ -34,8 +34,8 @@ config BUSYBOX_CONFIG_FAKEIDENTD
bool "fakeidentd" bool "fakeidentd"
default n default n
help help
fakeidentd listens to the ident port and returns a set fake fakeidentd listens on the ident port and returns a predefined
value whatever it gets. fake value on any query.
config BUSYBOX_CONFIG_FTPGET config BUSYBOX_CONFIG_FTPGET
bool "ftpget" bool "ftpget"
@ -49,6 +49,13 @@ config BUSYBOX_CONFIG_FTPPUT
help help
Store a remote file via FTP. Store a remote file via FTP.
config BUSYBOX_CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS
bool "Enable long options in ftpget/ftpput"
default n
depends on BUSYBOX_CONFIG_GETOPT_LONG && (CONFIG_FTPGET || BUSYBOX_CONFIG_FTPPUT)
help
Support long options for the ftpget/ftpput applet.
config BUSYBOX_CONFIG_HOSTNAME config BUSYBOX_CONFIG_HOSTNAME
bool "hostname" bool "hostname"
default n default n
@ -61,16 +68,34 @@ config BUSYBOX_CONFIG_HTTPD
help help
Serve web pages via an HTTP server. Serve web pages via an HTTP server.
config BUSYBOX_CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY config BUSYBOX_CONFIG_FEATURE_HTTPD_WITHOUT_INETD
bool " Support using httpd only from inetd" bool "Support using httpd as a daemon (not from inetd)"
default n default y
depends on BUSYBOX_CONFIG_HTTPD depends on BUSYBOX_CONFIG_HTTPD
help help
This option disables uid and port options for the httpd applet This option enables uid and port options for the httpd applet,
but requires inetd server daemon. and eliminates the need to be called from the inetd server daemon.
config BUSYBOX_CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
bool "Support reloading the global config file using hup signal"
default n
depends on BUSYBOX_CONFIG_HTTPD && BUSYBOX_CONFIG_FEATURE_HTTPD_WITHOUT_INETD
help
This option enables processing of SIGHUP to reload cached
configuration settings.
config BUSYBOX_CONFIG_FEATURE_HTTPD_SETUID
bool "Enable support -u <user> option"
default n
depends on BUSYBOX_CONFIG_HTTPD && BUSYBOX_CONFIG_FEATURE_HTTPD_WITHOUT_INETD
help
This option allows the server to run as a specific user
rather than defaulting to the user that starts the server.
Use of this option requires special privileges to change to a
different user.
config BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH config BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH
bool " Enable Basic http Authentication" bool "Enable Basic http Authentication"
default y default y
depends on BUSYBOX_CONFIG_HTTPD depends on BUSYBOX_CONFIG_HTTPD
help help
@ -78,35 +103,15 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH
authentication on a per url basis. authentication on a per url basis.
config BUSYBOX_CONFIG_FEATURE_HTTPD_AUTH_MD5 config BUSYBOX_CONFIG_FEATURE_HTTPD_AUTH_MD5
bool " Support MD5 crypted passwords for http Authentication" bool "Support MD5 crypted passwords for http Authentication"
default y default y
depends on BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH depends on BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH
help help
Enables basic per url authentication from /etc/httpd.conf Enables basic per URL authentication from /etc/httpd.conf
using md5 passwords. using md5 passwords.
if !CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
config BUSYBOX_CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
bool " Support reloading the global config file using hup signal"
default y
depends on BUSYBOX_CONFIG_HTTPD
help
This option enables processing of SIGHUP to reload cached
configuration settings.
config BUSYBOX_CONFIG_FEATURE_HTTPD_SETUID
bool " Enable support -u <user> option"
default n
depends on BUSYBOX_CONFIG_HTTPD
help
This option allows the server to run as a specific user
rather than defaulting to the user that starts the server.
Use of this option requires special privileges to change to a
different user.
endif
config BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES config BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES
bool " Support loading additional MIME types at run-time" bool "Support loading additional MIME types at run-time"
default y default y
depends on BUSYBOX_CONFIG_HTTPD depends on BUSYBOX_CONFIG_HTTPD
help help
@ -114,26 +119,26 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES
run-time to be specified in the configuration file. run-time to be specified in the configuration file.
config BUSYBOX_CONFIG_FEATURE_HTTPD_CGI config BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
bool " Support Common Gateway Interface (CGI)" bool "Support Common Gateway Interface (CGI)"
default y default y
depends on BUSYBOX_CONFIG_HTTPD depends on BUSYBOX_CONFIG_HTTPD
help help
This option allows scripts and executables to be invoked This option allows scripts and executables to be invoked
when specific urls are requested. when specific URLs are requested.
config BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR config BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
bool " Enable support for running scripts through an interpreter" bool "Enable support for running scripts through an interpreter"
default n default n
depends on BUSYBOX_CONFIG_FEATURE_HTTPD_CGI depends on BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
help help
This option enables support for running scripts through an This option enables support for running scripts through an
interpreter. Turn this on, if you want PHP scripts to work interpreter. Turn this on if you want PHP scripts to work
properly. You need to supply an addition line in your httpd properly. You need to supply an addition line in your httpd
config file: config file:
*.php:/path/to/your/php *.php:/path/to/your/php
config BUSYBOX_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV config BUSYBOX_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
bool " Support the REMOTE_PORT environment variable for CGI" bool "Support the REMOTE_PORT environment variable for CGI"
default y default y
depends on BUSYBOX_CONFIG_FEATURE_HTTPD_CGI depends on BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
help help
@ -141,11 +146,11 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
references that contain a unique port number. references that contain a unique port number.
config BUSYBOX_CONFIG_FEATURE_HTTPD_ENCODE_URL_STR config BUSYBOX_CONFIG_FEATURE_HTTPD_ENCODE_URL_STR
bool " Enable the -e option for shell script CGI simplification." bool "Enable the -e option for shell script CGI simplification."
default y default y
depends on BUSYBOX_CONFIG_HTTPD depends on BUSYBOX_CONFIG_HTTPD
help help
After set, this option allows html encoding arbitrary This option allows html encoding arbitrary
strings for display of the browser. Output goes to stdout. strings for display of the browser. Output goes to stdout.
For example, httpd -e "<Hello World>" as For example, httpd -e "<Hello World>" as
"&#60Hello&#32World&#62". "&#60Hello&#32World&#62".
@ -157,7 +162,7 @@ config BUSYBOX_CONFIG_IFCONFIG
Ifconfig is used to configure the kernel-resident network interfaces. Ifconfig is used to configure the kernel-resident network interfaces.
config BUSYBOX_CONFIG_FEATURE_IFCONFIG_STATUS config BUSYBOX_CONFIG_FEATURE_IFCONFIG_STATUS
bool " Enable status reporting output (+7k)" bool "Enable status reporting output (+7k)"
default y default y
depends on BUSYBOX_CONFIG_IFCONFIG depends on BUSYBOX_CONFIG_IFCONFIG
help help
@ -165,7 +170,7 @@ config BUSYBOX_CONFIG_FEATURE_IFCONFIG_STATUS
of the currently active interfaces. of the currently active interfaces.
config BUSYBOX_CONFIG_FEATURE_IFCONFIG_SLIP config BUSYBOX_CONFIG_FEATURE_IFCONFIG_SLIP
bool " Enable slip-specific options \"keepalive\" and \"outfill\"" bool "Enable slip-specific options \"keepalive\" and \"outfill\""
default n default n
depends on BUSYBOX_CONFIG_IFCONFIG depends on BUSYBOX_CONFIG_IFCONFIG
help help
@ -173,7 +178,7 @@ config BUSYBOX_CONFIG_FEATURE_IFCONFIG_SLIP
planning on using serial lines, leave this unchecked. planning on using serial lines, leave this unchecked.
config BUSYBOX_CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ config BUSYBOX_CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
bool " Enable options \"mem_start\", \"io_addr\", and \"irq\"" bool "Enable options \"mem_start\", \"io_addr\", and \"irq\""
default n default n
depends on BUSYBOX_CONFIG_IFCONFIG depends on BUSYBOX_CONFIG_IFCONFIG
help help
@ -181,7 +186,7 @@ config BUSYBOX_CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
and/or the interrupt line used by the specified device. and/or the interrupt line used by the specified device.
config BUSYBOX_CONFIG_FEATURE_IFCONFIG_HW config BUSYBOX_CONFIG_FEATURE_IFCONFIG_HW
bool " Enable option \"hw\" (ether only)" bool "Enable option \"hw\" (ether only)"
default y default y
depends on BUSYBOX_CONFIG_IFCONFIG depends on BUSYBOX_CONFIG_IFCONFIG
help help
@ -190,7 +195,7 @@ config BUSYBOX_CONFIG_FEATURE_IFCONFIG_HW
class. class.
config BUSYBOX_CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS config BUSYBOX_CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS
bool " Set the broadcast automatically" bool "Set the broadcast automatically"
default y default y
depends on BUSYBOX_CONFIG_IFCONFIG depends on BUSYBOX_CONFIG_IFCONFIG
help help
@ -215,7 +220,7 @@ config BUSYBOX_CONFIG_IFUPDOWN
standalone utilities. standalone utilities.
config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP
bool " Use ip applet" bool "Use ip applet"
default n default n
depends on BUSYBOX_CONFIG_IFUPDOWN depends on BUSYBOX_CONFIG_IFUPDOWN
help help
@ -223,7 +228,7 @@ config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP
than the default of using the older 'ifconfig' and 'route' utilities. than the default of using the older 'ifconfig' and 'route' utilities.
config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN
bool " Use busybox ip applet" bool "Use busybox ip applet"
default n default n
depends on BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP depends on BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP
select BUSYBOX_CONFIG_IP select BUSYBOX_CONFIG_IP
@ -237,7 +242,7 @@ config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN
utility or the "ifup" and "ifdown" applets will not work. utility or the "ifup" and "ifdown" applets will not work.
config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN
bool " Use busybox ifconfig and route applets" bool "Use busybox ifconfig and route applets"
default n default n
depends on BUSYBOX_CONFIG_IFUPDOWN && !CONFIG_FEATURE_IFUPDOWN_IP depends on BUSYBOX_CONFIG_IFUPDOWN && !CONFIG_FEATURE_IFUPDOWN_IP
select BUSYBOX_CONFIG_IFCONFIG select BUSYBOX_CONFIG_IFCONFIG
@ -251,21 +256,21 @@ config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN
work. work.
config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPV4 config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPV4
bool " Enable support for IPv4" bool "Enable support for IPv4"
default n default n
depends on BUSYBOX_CONFIG_IFUPDOWN depends on BUSYBOX_CONFIG_IFUPDOWN
help help
If you want busybox to talk IPv4, leave this on. If you want busybox to talk IPv4, leave this on.
config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPV6 config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPV6
bool " Enable support for IPv6" bool "Enable support for IPv6"
default n default n
depends on BUSYBOX_CONFIG_IFUPDOWN depends on BUSYBOX_CONFIG_IFUPDOWN && BUSYBOX_CONFIG_FEATURE_IPV6
help help
If you need support for IPv6, turn this option on. If you need support for IPv6, turn this option on.
config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPX config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPX
bool " Enable support for IPX" bool "Enable support for IPX"
default n default n
depends on BUSYBOX_CONFIG_IFUPDOWN depends on BUSYBOX_CONFIG_IFUPDOWN
help help
@ -273,7 +278,7 @@ config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPX
networks. networks.
config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_MAPPING config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_MAPPING
bool " Enable mapping support" bool "Enable mapping support"
default n default n
depends on BUSYBOX_CONFIG_IFUPDOWN depends on BUSYBOX_CONFIG_IFUPDOWN
help help
@ -286,43 +291,43 @@ config BUSYBOX_CONFIG_INETD
help help
Internet superserver daemon Internet superserver daemon
config BUSYBOX_CONFIG_FEATURE_INETD_SUPPORT_BILTIN_ECHO config BUSYBOX_CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO
bool " Support echo service" bool "Support echo service"
default n default n
depends on BUSYBOX_CONFIG_INETD depends on BUSYBOX_CONFIG_INETD
help help
Echo received data internal inetd service Echo received data internal inetd service
config BUSYBOX_CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DISCARD config BUSYBOX_CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
bool " Support discard service" bool "Support discard service"
default n default n
depends on BUSYBOX_CONFIG_INETD depends on BUSYBOX_CONFIG_INETD
help help
Internet /dev/null internal inetd service Internet /dev/null internal inetd service
config BUSYBOX_CONFIG_FEATURE_INETD_SUPPORT_BILTIN_TIME config BUSYBOX_CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME
bool " Support time service" bool "Support time service"
default n default n
depends on BUSYBOX_CONFIG_INETD depends on BUSYBOX_CONFIG_INETD
help help
Return 32 bit time since 1900 internal inetd service Return 32 bit time since 1900 internal inetd service
config BUSYBOX_CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DAYTIME config BUSYBOX_CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
bool " Support daytime service" bool "Support daytime service"
default n default n
depends on BUSYBOX_CONFIG_INETD depends on BUSYBOX_CONFIG_INETD
help help
Return human-readable time internal inetd service Return human-readable time internal inetd service
config BUSYBOX_CONFIG_FEATURE_INETD_SUPPORT_BILTIN_CHARGEN config BUSYBOX_CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
bool " Support chargen service" bool "Support chargen service"
default n default n
depends on BUSYBOX_CONFIG_INETD depends on BUSYBOX_CONFIG_INETD
help help
Familiar character generator internal inetd service Familiar character generator internal inetd service
config BUSYBOX_CONFIG_FEATURE_INETD_RPC config BUSYBOX_CONFIG_FEATURE_INETD_RPC
bool " Support RPC services" bool "Support RPC services"
default n default n
depends on BUSYBOX_CONFIG_INETD depends on BUSYBOX_CONFIG_INETD
help help
@ -337,61 +342,67 @@ config BUSYBOX_CONFIG_IP
utility. You generally don't need "ip" to use busybox with utility. You generally don't need "ip" to use busybox with
TCP/IP. TCP/IP.
if BUSYBOX_CONFIG_IP && BUSYBOX_CONFIG_IPADDR config BUSYBOX_CONFIG_FEATURE_IP_ADDRESS
config BUSYBOX_CONFIG_FEATURE_IP_ADDRESS bool "ip address"
default n default n
comment " address (forced enabled for ipaddr)" depends on BUSYBOX_CONFIG_IP
endif help
if ! (CONFIG_IP && BUSYBOX_CONFIG_IPADDR) Address manipulation support for the "ip" applet.
config BUSYBOX_CONFIG_FEATURE_IP_ADDRESS
bool " address"
default n
depends on BUSYBOX_CONFIG_IP
help
Address manipulation support for the "ip" applet.
endif
if BUSYBOX_CONFIG_IP && BUSYBOX_CONFIG_IPLINK config BUSYBOX_CONFIG_FEATURE_IP_LINK
config BUSYBOX_CONFIG_FEATURE_IP_LINK bool "ip link"
default n default n
comment " link (forced enabled for iplink)" depends on BUSYBOX_CONFIG_IP
endif help
if !(CONFIG_IP && BUSYBOX_CONFIG_IPLINK) Configure network devices with "ip".
config BUSYBOX_CONFIG_FEATURE_IP_LINK
bool " link"
default n
depends on BUSYBOX_CONFIG_IP
help
Configure network devices with "ip".
endif
if BUSYBOX_CONFIG_IP && BUSYBOX_CONFIG_IPROUTE config BUSYBOX_CONFIG_FEATURE_IP_ROUTE
config BUSYBOX_CONFIG_FEATURE_IP_ROUTE bool "ip route"
default n default n
comment " route (forced enabled for iproute)" depends on BUSYBOX_CONFIG_IP
endif help
if !(CONFIG_IP && BUSYBOX_CONFIG_IPROUTE) Add support for routing table management to "ip".
config BUSYBOX_CONFIG_FEATURE_IP_ROUTE
bool " route"
default n
depends on BUSYBOX_CONFIG_IP
help
Add support for routing table management to "ip".
endif
if BUSYBOX_CONFIG_IP && BUSYBOX_CONFIG_IPTUNNEL config BUSYBOX_CONFIG_FEATURE_IP_TUNNEL
config BUSYBOX_CONFIG_FEATURE_IP_TUNNEL bool "ip tunnel"
default n default n
comment " tunnel (forced enabled for iptunnel)" depends on BUSYBOX_CONFIG_IP
endif help
if !(CONFIG_IP && BUSYBOX_CONFIG_IPTUNNEL) Add support for tunneling commands to "ip".
config BUSYBOX_CONFIG_FEATURE_IP_TUNNEL
bool " tunnel" config BUSYBOX_CONFIG_FEATURE_IP_SHORT_FORMS
default n bool "Support short forms of ip commands."
depends on BUSYBOX_CONFIG_IP default n
help depends on BUSYBOX_CONFIG_IP
Add support for tunneling commands to "ip". help
endif Also support short-form of ip <OBJECT> commands:
ip addr -> ipaddr
ip link -> iplink
ip route -> iproute
ip tunnel -> iptunnel
Say N unless you desparately need the short form of the ip
object commands.
config BUSYBOX_CONFIG_IPADDR
bool
default n
depends on BUSYBOX_CONFIG_FEATURE_IP_SHORT_FORMS && BUSYBOX_CONFIG_FEATURE_IP_ADDRESS
config BUSYBOX_CONFIG_IPLINK
bool
default n
depends on BUSYBOX_CONFIG_FEATURE_IP_SHORT_FORMS && BUSYBOX_CONFIG_FEATURE_IP_LINK
config BUSYBOX_CONFIG_IPROUTE
bool
default n
depends on BUSYBOX_CONFIG_FEATURE_IP_SHORT_FORMS && BUSYBOX_CONFIG_FEATURE_IP_ROUTE
config BUSYBOX_CONFIG_IPTUNNEL
bool
default n
depends on BUSYBOX_CONFIG_FEATURE_IP_SHORT_FORMS && BUSYBOX_CONFIG_FEATURE_IP_TUNNEL
config BUSYBOX_CONFIG_IPCALC config BUSYBOX_CONFIG_IPCALC
bool "ipcalc" bool "ipcalc"
@ -401,35 +412,18 @@ config BUSYBOX_CONFIG_IPCALC
resulting broadcast, network, and host range. resulting broadcast, network, and host range.
config BUSYBOX_CONFIG_FEATURE_IPCALC_FANCY config BUSYBOX_CONFIG_FEATURE_IPCALC_FANCY
bool " Fancy IPCALC, more options, adds 1 kbyte" bool "Fancy IPCALC, more options, adds 1 kbyte"
default n default n
depends on BUSYBOX_CONFIG_IPCALC depends on BUSYBOX_CONFIG_IPCALC
help help
Adds the options hostname, prefix and silent to the output of "ipcalc". Adds the options hostname, prefix and silent to the output of "ipcalc".
config BUSYBOX_CONFIG_IPADDR config BUSYBOX_CONFIG_FEATURE_IPCALC_LONG_OPTIONS
bool "ipaddr" bool "Enable long options"
default n default n
depends on BUSYBOX_CONFIG_IPCALC && BUSYBOX_CONFIG_GETOPT_LONG
help help
Equivalent to selecting address support to "ip", above. Support long options for the ipcalc applet.
config BUSYBOX_CONFIG_IPLINK
bool "iplink"
default n
help
Equivalent to selecting link support to "ip", above.
config BUSYBOX_CONFIG_IPROUTE
bool "iproute"
default n
help
Equivalent to selecting route support to "ip", above.
config BUSYBOX_CONFIG_IPTUNNEL
bool "iptunnel"
default n
help
Equivalent to selecting tunnel support to "ip", above.
config BUSYBOX_CONFIG_NAMEIF config BUSYBOX_CONFIG_NAMEIF
bool "nameif" bool "nameif"
@ -486,7 +480,7 @@ config BUSYBOX_CONFIG_PING
elicit an ICMP ECHO_RESPONSE from a host or gateway. elicit an ICMP ECHO_RESPONSE from a host or gateway.
config BUSYBOX_CONFIG_FEATURE_FANCY_PING config BUSYBOX_CONFIG_FEATURE_FANCY_PING
bool " Enable fancy ping output" bool "Enable fancy ping output"
default y default y
depends on BUSYBOX_CONFIG_PING depends on BUSYBOX_CONFIG_PING
help help
@ -501,7 +495,7 @@ config BUSYBOX_CONFIG_PING6
This will give you a ping that can talk IPv6. This will give you a ping that can talk IPv6.
config BUSYBOX_CONFIG_FEATURE_FANCY_PING6 config BUSYBOX_CONFIG_FEATURE_FANCY_PING6
bool " Enable fancy ping6 output" bool "Enable fancy ping6 output"
default y default y
depends on BUSYBOX_CONFIG_PING6 depends on BUSYBOX_CONFIG_PING6
help help
@ -522,7 +516,7 @@ config BUSYBOX_CONFIG_TELNET
used to test other simple protocols. used to test other simple protocols.
config BUSYBOX_CONFIG_FEATURE_TELNET_TTYPE config BUSYBOX_CONFIG_FEATURE_TELNET_TTYPE
bool " Pass TERM type to remote host" bool "Pass TERM type to remote host"
default y default y
depends on BUSYBOX_CONFIG_TELNET depends on BUSYBOX_CONFIG_TELNET
help help
@ -531,7 +525,7 @@ config BUSYBOX_CONFIG_FEATURE_TELNET_TTYPE
things like ANSI colors and other control sequences behave. things like ANSI colors and other control sequences behave.
config BUSYBOX_CONFIG_FEATURE_TELNET_AUTOLOGIN config BUSYBOX_CONFIG_FEATURE_TELNET_AUTOLOGIN
bool " Pass USER type to remote host" bool "Pass USER type to remote host"
default n default n
depends on BUSYBOX_CONFIG_TELNET depends on BUSYBOX_CONFIG_TELNET
help help
@ -583,7 +577,7 @@ config BUSYBOX_CONFIG_TELNETD
config BUSYBOX_CONFIG_FEATURE_TELNETD_INETD config BUSYBOX_CONFIG_FEATURE_TELNETD_INETD
bool " Support call from inetd only" bool "Support call from inetd only"
default n default n
depends on BUSYBOX_CONFIG_TELNETD depends on BUSYBOX_CONFIG_TELNETD
help help
@ -599,7 +593,7 @@ config BUSYBOX_CONFIG_TFTP
for a network-enabled bootloader. for a network-enabled bootloader.
config BUSYBOX_CONFIG_FEATURE_TFTP_GET config BUSYBOX_CONFIG_FEATURE_TFTP_GET
bool " Enable \"get\" command" bool "Enable \"get\" command"
default n default n
depends on BUSYBOX_CONFIG_TFTP depends on BUSYBOX_CONFIG_TFTP
help help
@ -607,7 +601,7 @@ config BUSYBOX_CONFIG_FEATURE_TFTP_GET
a client to retrieve a file from a TFTP server. a client to retrieve a file from a TFTP server.
config BUSYBOX_CONFIG_FEATURE_TFTP_PUT config BUSYBOX_CONFIG_FEATURE_TFTP_PUT
bool " Enable \"put\" command" bool "Enable \"put\" command"
default n default n
depends on BUSYBOX_CONFIG_TFTP depends on BUSYBOX_CONFIG_TFTP
help help
@ -615,14 +609,14 @@ config BUSYBOX_CONFIG_FEATURE_TFTP_PUT
a client to transfer a file to a TFTP server. a client to transfer a file to a TFTP server.
config BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE config BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE
bool " Enable \"blocksize\" command" bool "Enable \"blocksize\" command"
default n default n
depends on BUSYBOX_CONFIG_TFTP depends on BUSYBOX_CONFIG_TFTP
help help
Allow the client to specify the desired block size for transfers. Allow the client to specify the desired block size for transfers.
config BUSYBOX_CONFIG_FEATURE_TFTP_DEBUG config BUSYBOX_CONFIG_DEBUG_TFTP
bool " Enable debug" bool "Enable debug"
default n default n
depends on BUSYBOX_CONFIG_TFTP depends on BUSYBOX_CONFIG_TFTP
help help
@ -637,7 +631,7 @@ config BUSYBOX_CONFIG_TRACEROUTE
Utility to trace the route of IP packets Utility to trace the route of IP packets
config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_VERBOSE config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_VERBOSE
bool " Enable verbose output" bool "Enable verbose output"
default y default y
depends on BUSYBOX_CONFIG_TRACEROUTE depends on BUSYBOX_CONFIG_TRACEROUTE
help help
@ -645,7 +639,7 @@ config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_VERBOSE
hostnames and ICMP response types. hostnames and ICMP response types.
config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
bool " Enable loose source route" bool "Enable loose source route"
default n default n
depends on BUSYBOX_CONFIG_TRACEROUTE depends on BUSYBOX_CONFIG_TRACEROUTE
help help
@ -653,12 +647,13 @@ config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
(8 maximum). (8 maximum).
config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_USE_ICMP config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_USE_ICMP
bool " Use ICMP instead of UDP" bool "Use ICMP instead of UDP"
default n default n
depends on BUSYBOX_CONFIG_TRACEROUTE depends on BUSYBOX_CONFIG_TRACEROUTE
help help
Add feature to allow for ICMP ECHO instead of UDP datagrams. Add feature to allow for ICMP ECHO instead of UDP datagrams.
source package/busybox/config/networking/udhcp/Config.in
config BUSYBOX_CONFIG_VCONFIG config BUSYBOX_CONFIG_VCONFIG
bool "vconfig" bool "vconfig"
@ -674,27 +669,32 @@ config BUSYBOX_CONFIG_WGET
HTTPS, and FTP servers. HTTPS, and FTP servers.
config BUSYBOX_CONFIG_FEATURE_WGET_STATUSBAR config BUSYBOX_CONFIG_FEATURE_WGET_STATUSBAR
bool " Enable a nifty process meter (+2k)" bool "Enable a nifty process meter (+2k)"
default y default y
depends on BUSYBOX_CONFIG_WGET depends on BUSYBOX_CONFIG_WGET
help help
Enable the transfer progress bar for wget transfers. Enable the transfer progress bar for wget transfers.
config BUSYBOX_CONFIG_FEATURE_WGET_AUTHENTICATION config BUSYBOX_CONFIG_FEATURE_WGET_AUTHENTICATION
bool " Enable HTTP authentication" bool "Enable HTTP authentication"
default y default y
depends on BUSYBOX_CONFIG_WGET depends on BUSYBOX_CONFIG_WGET
help help
Support authenticated HTTP transfers. Support authenticated HTTP transfers.
config BUSYBOX_CONFIG_FEATURE_WGET_IP6_LITERAL config BUSYBOX_CONFIG_FEATURE_WGET_IP6_LITERAL
bool " Enable IPv6 literal addresses" bool "Enable IPv6 literal addresses"
default y default y
depends on BUSYBOX_CONFIG_WGET depends on BUSYBOX_CONFIG_WGET && BUSYBOX_CONFIG_FEATURE_IPV6
help help
Support IPv6 address literal notation in URLs. Support IPv6 address literal notation in URLs.
source package/busybox/config/networking/udhcp/Config.in config BUSYBOX_CONFIG_FEATURE_WGET_LONG_OPTIONS
bool "Enable long options"
default y
depends on BUSYBOX_CONFIG_WGET && BUSYBOX_CONFIG_GETOPT_LONG
help
Support long options for the wget applet.
config BUSYBOX_CONFIG_ZCIP config BUSYBOX_CONFIG_ZCIP
bool "zcip" bool "zcip"
@ -708,4 +708,3 @@ config BUSYBOX_CONFIG_ZCIP
in the busybox examples. in the busybox examples.
endmenu endmenu

View File

@ -5,7 +5,7 @@
menu "udhcp Server/Client" menu "udhcp Server/Client"
config BUSYBOX_CONFIG_UDHCPD config BUSYBOX_CONFIG_APP_UDHCPD
bool "udhcp Server (udhcpd)" bool "udhcp Server (udhcpd)"
default n default n
help help
@ -14,7 +14,7 @@ config BUSYBOX_CONFIG_UDHCPD
See http://udhcp.busybox.net for further details. See http://udhcp.busybox.net for further details.
config BUSYBOX_CONFIG_UDHCPC config BUSYBOX_CONFIG_APP_UDHCPC
bool "udhcp Client (udhcpc)" bool "udhcp Client (udhcpc)"
default y default y
help help
@ -26,10 +26,10 @@ config BUSYBOX_CONFIG_UDHCPC
See http://udhcp.busybox.net for further details. See http://udhcp.busybox.net for further details.
config BUSYBOX_CONFIG_DUMPLEASES config BUSYBOX_CONFIG_APP_DUMPLEASES
bool "Lease display utility (dumpleases)" bool "Lease display utility (dumpleases)"
default n default n
depends on BUSYBOX_CONFIG_UDHCPD depends on BUSYBOX_CONFIG_APP_UDHCPD
help help
dumpleases displays the leases written out by the udhcpd server. dumpleases displays the leases written out by the udhcpd server.
Lease times are stored in the file by time remaining in lease, or Lease times are stored in the file by time remaining in lease, or
@ -40,7 +40,7 @@ config BUSYBOX_CONFIG_DUMPLEASES
config BUSYBOX_CONFIG_FEATURE_UDHCP_SYSLOG config BUSYBOX_CONFIG_FEATURE_UDHCP_SYSLOG
bool " Log udhcp messages to syslog (instead of stdout)" bool " Log udhcp messages to syslog (instead of stdout)"
default n default n
depends on BUSYBOX_CONFIG_UDHCPD || BUSYBOX_CONFIG_UDHCPC depends on BUSYBOX_CONFIG_APP_UDHCPD || BUSYBOX_CONFIG_APP_UDHCPC
help help
If selected, udhcpd will log all its messages to syslog, otherwise, If selected, udhcpd will log all its messages to syslog, otherwise,
it will attempt to log them to stdout. it will attempt to log them to stdout.
@ -50,7 +50,7 @@ config BUSYBOX_CONFIG_FEATURE_UDHCP_SYSLOG
config BUSYBOX_CONFIG_FEATURE_UDHCP_DEBUG config BUSYBOX_CONFIG_FEATURE_UDHCP_DEBUG
bool " Compile udhcp with noisy debugging messages" bool " Compile udhcp with noisy debugging messages"
default n default n
depends on BUSYBOX_CONFIG_UDHCPD || BUSYBOX_CONFIG_UDHCPC depends on BUSYBOX_CONFIG_APP_UDHCPD || BUSYBOX_CONFIG_APP_UDHCPC
help help
If selected, udhcpd will output extra debugging output. If using If selected, udhcpd will output extra debugging output. If using
this option, compile uDHCP with "-g", and do not fork the daemon to this option, compile uDHCP with "-g", and do not fork the daemon to

View File

@ -51,14 +51,14 @@ config BUSYBOX_CONFIG_PIDOF
those id's on the standard output. those id's on the standard output.
config BUSYBOX_CONFIG_FEATURE_PIDOF_SINGLE config BUSYBOX_CONFIG_FEATURE_PIDOF_SINGLE
bool " Enable argument for single shot (-s)" bool "Enable argument for single shot (-s)"
default n default n
depends on BUSYBOX_CONFIG_PIDOF depends on BUSYBOX_CONFIG_PIDOF
help help
Support argument '-s' for returning only the first pid found. Support argument '-s' for returning only the first pid found.
config BUSYBOX_CONFIG_FEATURE_PIDOF_OMIT config BUSYBOX_CONFIG_FEATURE_PIDOF_OMIT
bool " Enable argument for omitting pids (-o)" bool "Enable argument for omitting pids (-o)"
default n default n
depends on BUSYBOX_CONFIG_PIDOF depends on BUSYBOX_CONFIG_PIDOF
help help
@ -73,7 +73,7 @@ config BUSYBOX_CONFIG_PS
ps gives a snapshot of the current processes. ps gives a snapshot of the current processes.
config BUSYBOX_CONFIG_FEATURE_PS_WIDE config BUSYBOX_CONFIG_FEATURE_PS_WIDE
bool " Enable argument for wide output (-w)" bool "Enable argument for wide output (-w)"
default n default n
depends on BUSYBOX_CONFIG_PS depends on BUSYBOX_CONFIG_PS
help help
@ -102,7 +102,7 @@ config BUSYBOX_CONFIG_TOP
system. system.
config BUSYBOX_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE config BUSYBOX_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE
bool " Support showing CPU usage percentage (add 2k bytes)" bool "Support showing CPU usage percentage (add 2k bytes)"
default y default y
depends on BUSYBOX_CONFIG_TOP depends on BUSYBOX_CONFIG_TOP
help help

View File

@ -48,14 +48,14 @@ comment "Ash Shell Options"
depends on BUSYBOX_CONFIG_ASH depends on BUSYBOX_CONFIG_ASH
config BUSYBOX_CONFIG_ASH_JOB_CONTROL config BUSYBOX_CONFIG_ASH_JOB_CONTROL
bool " Enable Job control" bool "Job control"
default y default y
depends on BUSYBOX_CONFIG_ASH depends on BUSYBOX_CONFIG_ASH
help help
Enable job control in the ash shell. Enable job control in the ash shell.
config BUSYBOX_CONFIG_ASH_READ_NCHARS config BUSYBOX_CONFIG_ASH_READ_NCHARS
bool " Enable 'read -n N' and 'read -s' support" bool "'read -n N' and 'read -s' support"
default n default n
depends on BUSYBOX_CONFIG_ASH depends on BUSYBOX_CONFIG_ASH
help help
@ -63,7 +63,7 @@ config BUSYBOX_CONFIG_ASH_READ_NCHARS
'read -s' will read without echoing the user's input. 'read -s' will read without echoing the user's input.
config BUSYBOX_CONFIG_ASH_READ_TIMEOUT config BUSYBOX_CONFIG_ASH_READ_TIMEOUT
bool " Enable 'read -t S' support." bool "'read -t S' support."
default y default y
depends on BUSYBOX_CONFIG_ASH depends on BUSYBOX_CONFIG_ASH
help help
@ -72,21 +72,21 @@ config BUSYBOX_CONFIG_ASH_READ_TIMEOUT
as a decimal fraction, e.g. 'read -t 2.5 foo'. as a decimal fraction, e.g. 'read -t 2.5 foo'.
config BUSYBOX_CONFIG_ASH_ALIAS config BUSYBOX_CONFIG_ASH_ALIAS
bool " Enable alias support" bool "alias support"
default y default y
depends on BUSYBOX_CONFIG_ASH depends on BUSYBOX_CONFIG_ASH
help help
Enable alias support in the ash shell. Enable alias support in the ash shell.
config BUSYBOX_CONFIG_ASH_MATH_SUPPORT config BUSYBOX_CONFIG_ASH_MATH_SUPPORT
bool " Enable Posix math support" bool "Posix math support"
default y default y
depends on BUSYBOX_CONFIG_ASH depends on BUSYBOX_CONFIG_ASH
help help
Enable math support in the ash shell. Enable math support in the ash shell.
config BUSYBOX_CONFIG_ASH_MATH_SUPPORT_64 config BUSYBOX_CONFIG_ASH_MATH_SUPPORT_64
bool " Extend Posix math support to 64 bit" bool "Extend Posix math support to 64 bit"
default n default n
depends on BUSYBOX_CONFIG_ASH_MATH_SUPPORT depends on BUSYBOX_CONFIG_ASH_MATH_SUPPORT
help help
@ -95,14 +95,30 @@ config BUSYBOX_CONFIG_ASH_MATH_SUPPORT_64
large numbers. large numbers.
config BUSYBOX_CONFIG_ASH_GETOPTS config BUSYBOX_CONFIG_ASH_GETOPTS
bool " Enable getopts builtin to parse positional parameters" bool "Builtin getopt to parse positional parameters"
default y default y
depends on BUSYBOX_CONFIG_ASH depends on BUSYBOX_CONFIG_ASH
help help
Enable getopts builtin in the ash shell. Enable getopts builtin in the ash shell.
config BUSYBOX_CONFIG_ASH_BUILTIN_ECHO
bool "Builtin version of 'echo'"
default y
select BUSYBOX_CONFIG_ECHO
depends on BUSYBOX_CONFIG_ASH
help
Enable support for echo, built in to ash.
config BUSYBOX_CONFIG_ASH_BUILTIN_TEST
bool "Builtin version of 'test'"
default y
select BUSYBOX_CONFIG_TEST
depends on BUSYBOX_CONFIG_ASH
help
Enable support for test, built in to ash.
config BUSYBOX_CONFIG_ASH_CMDCMD config BUSYBOX_CONFIG_ASH_CMDCMD
bool " Enable cmdcmd to override shell builtins" bool "'command' command to override shell builtins"
default y default y
depends on BUSYBOX_CONFIG_ASH depends on BUSYBOX_CONFIG_ASH
help help
@ -110,37 +126,22 @@ config BUSYBOX_CONFIG_ASH_CMDCMD
you to run the specified command with the specified arguments, you to run the specified command with the specified arguments,
even when there is an ash builtin command with the same name. even when there is an ash builtin command with the same name.
config BUSYBOX_CONFIG_ASH_BUILTIN_ECHO
bool " Enable builtin version of 'echo'"
default y
depends on BUSYBOX_CONFIG_ASH
help
Enable support for echo, built in to ash.
# this entry also appears in coreutils/Config.in, next to the echo applet
config BUSYBOX_CONFIG_FEATURE_FANCY_ECHO
bool " Enable echo options (-n and -e)"
default y
depends on BUSYBOX_CONFIG_ASH_BUILTIN_ECHO
help
This adds options (-n and -e) to echo.
config BUSYBOX_CONFIG_ASH_MAIL config BUSYBOX_CONFIG_ASH_MAIL
bool " Check for new mail on interactive shells" bool "Check for new mail on interactive shells"
default n default n
depends on BUSYBOX_CONFIG_ASH depends on BUSYBOX_CONFIG_ASH
help help
Enable "check for new mail" in the ash shell. Enable "check for new mail" in the ash shell.
config BUSYBOX_CONFIG_ASH_OPTIMIZE_FOR_SIZE config BUSYBOX_CONFIG_ASH_OPTIMIZE_FOR_SIZE
bool " Optimize for size instead of speed" bool "Optimize for size instead of speed"
default y default y
depends on BUSYBOX_CONFIG_ASH depends on BUSYBOX_CONFIG_ASH
help help
Compile ash for reduced size at the price of speed. Compile ash for reduced size at the price of speed.
config BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT config BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT
bool " Enable pseudorandom generator and variable $RANDOM" bool "Pseudorandom generator and variable $RANDOM"
default n default n
depends on BUSYBOX_CONFIG_ASH depends on BUSYBOX_CONFIG_ASH
help help
@ -151,7 +152,7 @@ config BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT
variable will no longer have special treatment. variable will no longer have special treatment.
config BUSYBOX_CONFIG_ASH_EXPAND_PRMT config BUSYBOX_CONFIG_ASH_EXPAND_PRMT
bool " Expand prompt string" bool "Expand prompt string"
default n default n
depends on BUSYBOX_CONFIG_ASH depends on BUSYBOX_CONFIG_ASH
help help
@ -229,13 +230,18 @@ config BUSYBOX_CONFIG_FEATURE_SH_STANDALONE_SHELL
is generally used when creating a statically linked version of busybox is generally used when creating a statically linked version of busybox
for use as a rescue shell, in the event that you screw up your system. for use as a rescue shell, in the event that you screw up your system.
Note that this will *also* cause applets to take precedence
over shell builtins of the same name. So turning this on will
eliminate any performance gained by turning on the builtin "echo"
and "test" commands in ash.
Note that when using this option, the shell will attempt to directly Note that when using this option, the shell will attempt to directly
run '/bin/busybox'. If you do not have the busybox binary sitting in run '/bin/busybox'. If you do not have the busybox binary sitting in
that exact location with that exact name, this option will not work at that exact location with that exact name, this option will not work at
all. all.
config BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING config BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING
bool "command line editing" bool "Command line editing"
default y default y
depends on BUSYBOX_CONFIG_MSH || BUSYBOX_CONFIG_LASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH depends on BUSYBOX_CONFIG_MSH || BUSYBOX_CONFIG_LASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH
help help
@ -250,28 +256,28 @@ config BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING_VI
turned on and off with "set -o vi" and "set +o vi". turned on and off with "set -o vi" and "set +o vi".
config BUSYBOX_CONFIG_FEATURE_COMMAND_HISTORY config BUSYBOX_CONFIG_FEATURE_COMMAND_HISTORY
int "history size" int "History size"
default 15 default 15
depends on BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING depends on BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING
help help
Specify command history size in shell. Specify command history size in shell.
config BUSYBOX_CONFIG_FEATURE_COMMAND_SAVEHISTORY config BUSYBOX_CONFIG_FEATURE_COMMAND_SAVEHISTORY
bool "history saving" bool "History saving"
default n default n
depends on BUSYBOX_CONFIG_ASH && BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING depends on BUSYBOX_CONFIG_ASH && BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING
help help
Enable history saving in ash shell. Enable history saving in ash shell.
config BUSYBOX_CONFIG_FEATURE_COMMAND_TAB_COMPLETION config BUSYBOX_CONFIG_FEATURE_COMMAND_TAB_COMPLETION
bool "tab completion" bool "Tab completion"
default y default y
depends on BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING depends on BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING
help help
Enable tab completion in shell. Enable tab completion in shell.
config BUSYBOX_CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION config BUSYBOX_CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION
bool "username completion" bool "Username completion"
default n default n
depends on BUSYBOX_CONFIG_FEATURE_COMMAND_TAB_COMPLETION depends on BUSYBOX_CONFIG_FEATURE_COMMAND_TAB_COMPLETION
help help

View File

@ -21,7 +21,7 @@ config BUSYBOX_CONFIG_SYSLOGD
you wait long enough.... you wait long enough....
config BUSYBOX_CONFIG_FEATURE_ROTATE_LOGFILE config BUSYBOX_CONFIG_FEATURE_ROTATE_LOGFILE
bool " Rotate message files" bool "Rotate message files"
default y default y
depends on BUSYBOX_CONFIG_SYSLOGD depends on BUSYBOX_CONFIG_SYSLOGD
help help
@ -29,7 +29,7 @@ config BUSYBOX_CONFIG_FEATURE_ROTATE_LOGFILE
on his own. No need to use an external rotatescript. on his own. No need to use an external rotatescript.
config BUSYBOX_CONFIG_FEATURE_REMOTE_LOG config BUSYBOX_CONFIG_FEATURE_REMOTE_LOG
bool " Remote Log support" bool "Remote Log support"
default y default y
depends on BUSYBOX_CONFIG_SYSLOGD depends on BUSYBOX_CONFIG_SYSLOGD
help help
@ -43,7 +43,7 @@ config BUSYBOX_CONFIG_FEATURE_REMOTE_LOG
by an intruder. by an intruder.
config BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG config BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG
bool " Circular Buffer support" bool "Circular Buffer support"
default y default y
depends on BUSYBOX_CONFIG_SYSLOGD depends on BUSYBOX_CONFIG_SYSLOGD
help help
@ -65,7 +65,7 @@ config BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE
used to record system log messages. used to record system log messages.
config BUSYBOX_CONFIG_LOGREAD config BUSYBOX_CONFIG_LOGREAD
bool " logread" bool "logread"
default y default y
depends on BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG depends on BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG
help help
@ -75,7 +75,7 @@ config BUSYBOX_CONFIG_LOGREAD
stored in the syslogd circular buffer. stored in the syslogd circular buffer.
config BUSYBOX_CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING config BUSYBOX_CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING
bool " logread double buffering" bool "logread double buffering"
default n default n
depends on BUSYBOX_CONFIG_LOGREAD depends on BUSYBOX_CONFIG_LOGREAD
help help

View File

@ -27,7 +27,7 @@ config BUSYBOX_CONFIG_FBSET
if you wish to enable the 'fbset' utility. if you wish to enable the 'fbset' utility.
config BUSYBOX_CONFIG_FEATURE_FBSET_FANCY config BUSYBOX_CONFIG_FEATURE_FBSET_FANCY
bool " Turn on extra fbset options" bool "Turn on extra fbset options"
default n default n
depends on BUSYBOX_CONFIG_FBSET depends on BUSYBOX_CONFIG_FBSET
help help
@ -37,7 +37,7 @@ config BUSYBOX_CONFIG_FEATURE_FBSET_FANCY
options. options.
config BUSYBOX_CONFIG_FEATURE_FBSET_READMODE config BUSYBOX_CONFIG_FEATURE_FBSET_READMODE
bool " Turn on fbset readmode support" bool "Turn on fbset readmode support"
default n default n
depends on BUSYBOX_CONFIG_FBSET depends on BUSYBOX_CONFIG_FBSET
help help
@ -80,7 +80,7 @@ config BUSYBOX_FDISK_SUPPORT_LARGE_DISKS
Enable this option to support large disks > 4GB. Enable this option to support large disks > 4GB.
config BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE config BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
bool " Write support" bool "Write support"
default n default n
depends on BUSYBOX_CONFIG_FDISK depends on BUSYBOX_CONFIG_FDISK
help help
@ -89,7 +89,7 @@ config BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
disabled, you will only be able to view the partition table. disabled, you will only be able to view the partition table.
config BUSYBOX_CONFIG_FEATURE_AIX_LABEL config BUSYBOX_CONFIG_FEATURE_AIX_LABEL
bool " Support AIX disklabels" bool "Support AIX disklabels"
default n default n
depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
help help
@ -97,7 +97,7 @@ config BUSYBOX_CONFIG_FEATURE_AIX_LABEL
Most people can safely leave this option disabled. Most people can safely leave this option disabled.
config BUSYBOX_CONFIG_FEATURE_SGI_LABEL config BUSYBOX_CONFIG_FEATURE_SGI_LABEL
bool " Support SGI disklabels" bool "Support SGI disklabels"
default n default n
depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
help help
@ -105,7 +105,7 @@ config BUSYBOX_CONFIG_FEATURE_SGI_LABEL
Most people can safely leave this option disabled. Most people can safely leave this option disabled.
config BUSYBOX_CONFIG_FEATURE_SUN_LABEL config BUSYBOX_CONFIG_FEATURE_SUN_LABEL
bool " Support SUN disklabels" bool "Support SUN disklabels"
default n default n
depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
help help
@ -113,7 +113,7 @@ config BUSYBOX_CONFIG_FEATURE_SUN_LABEL
Most people can safely leave this option disabled. Most people can safely leave this option disabled.
config BUSYBOX_CONFIG_FEATURE_OSF_LABEL config BUSYBOX_CONFIG_FEATURE_OSF_LABEL
bool " Support BSD disklabels" bool "Support BSD disklabels"
default n default n
depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
help help
@ -121,7 +121,7 @@ config BUSYBOX_CONFIG_FEATURE_OSF_LABEL
and define and edit BSD disk slices. and define and edit BSD disk slices.
config BUSYBOX_CONFIG_FEATURE_FDISK_ADVANCED config BUSYBOX_CONFIG_FEATURE_FDISK_ADVANCED
bool " Support expert mode" bool "Support expert mode"
default n default n
depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
help help
@ -164,7 +164,7 @@ comment "Minix filesystem support"
depends on BUSYBOX_CONFIG_FSCK_MINIX || BUSYBOX_CONFIG_MKFS_MINIX depends on BUSYBOX_CONFIG_FSCK_MINIX || BUSYBOX_CONFIG_MKFS_MINIX
config BUSYBOX_CONFIG_FEATURE_MINIX2 config BUSYBOX_CONFIG_FEATURE_MINIX2
bool " Support Minix fs v2 (fsck_minix/mkfs_minix)" bool "Support Minix fs v2 (fsck_minix/mkfs_minix)"
default n default n
depends on BUSYBOX_CONFIG_FSCK_MINIX || BUSYBOX_CONFIG_MKFS_MINIX depends on BUSYBOX_CONFIG_FSCK_MINIX || BUSYBOX_CONFIG_MKFS_MINIX
help help
@ -199,17 +199,17 @@ config BUSYBOX_CONFIG_HWCLOCK
shutdown in the hardware clock, so the hardware will keep the shutdown in the hardware clock, so the hardware will keep the
correct time when Linux is _not_ running. correct time when Linux is _not_ running.
config BUSYBOX_CONFIG_FEATURE_HWCLOCK_LONGOPTIONS config BUSYBOX_CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS
bool " Support long options (--hctosys,...)" bool "Support long options (--hctosys,...)"
default n default n
depends on BUSYBOX_CONFIG_HWCLOCK depends on BUSYBOX_CONFIG_HWCLOCK && BUSYBOX_CONFIG_GETOPT_LONG
help help
By default, the hwclock utility only uses short options. If you By default, the hwclock utility only uses short options. If you
are overly fond of its long options, such as --hctosys, --utc, etc) are overly fond of its long options, such as --hctosys, --utc, etc)
then enable this option. then enable this option.
config BUSYBOX_CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS config BUSYBOX_CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS
bool " Use FHS /var/lib/hwclock/adjtime" bool "Use FHS /var/lib/hwclock/adjtime"
default n default n
depends on BUSYBOX_CONFIG_HWCLOCK depends on BUSYBOX_CONFIG_HWCLOCK
help help
@ -255,7 +255,7 @@ config BUSYBOX_CONFIG_MDEV
from sysfs. from sysfs.
config BUSYBOX_CONFIG_FEATURE_MDEV_CONF config BUSYBOX_CONFIG_FEATURE_MDEV_CONF
bool " Support /etc/mdev.conf" bool "Support /etc/mdev.conf"
default n default n
depends on BUSYBOX_CONFIG_MDEV depends on BUSYBOX_CONFIG_MDEV
help help
@ -265,16 +265,31 @@ config BUSYBOX_CONFIG_FEATURE_MDEV_CONF
That's device name (with regex match), uid:gid, and permissions. That's device name (with regex match), uid:gid, and permissions.
Optionally, that can be followed (on the same line) by an asterisk
and a command line to run after creating the corresponding device(s),
ala:
hdc root:cdrom 660 *ln -s hdc cdrom
Config file parsing stops on the first matching line. If no config Config file parsing stops on the first matching line. If no config
entry is matched, devices are created with default 0:0 660. (Make entry is matched, devices are created with default 0:0 660. (Make
the last line match .* to override this.) the last line match .* to override this.)
config BUSYBOX_CONFIG_FEATURE_MDEV_EXEC
bool "Support command execution at device addition/removal"
default n
depends on BUSYBOX_CONFIG_FEATURE_MDEV_CONF
help
This adds support for an optional field to /etc/mdev.conf, consisting
of a special character and a command line to run after creating the
corresponding device(s) and before removing, ala:
hdc root:cdrom 660 *ln -s $MDEV cdrom
The $MDEV environment variable is set to the name of the device.
The special characters and their meanings are:
@ Run after creating the device.
$ Run before removing the device.
* Run both after creating and before removing the device.
Commands are executed via system() so you need /bin/sh, meaning you
probably want to select a default shell in the Shells menu.
config BUSYBOX_CONFIG_MKSWAP config BUSYBOX_CONFIG_MKSWAP
bool "mkswap" bool "mkswap"
default n default n
@ -288,6 +303,16 @@ config BUSYBOX_CONFIG_MKSWAP
Once you have created swap space using 'mkswap' you need to enable Once you have created swap space using 'mkswap' you need to enable
the swap space using the 'swapon' utility. the swap space using the 'swapon' utility.
config BUSYBOX_CONFIG_FEATURE_MKSWAP_V0
bool "version 0 support"
default n
depends on BUSYBOX_CONFIG_MKSWAP
# depends on BUSYBOX_CONFIG_MKSWAP && BUSYBOX_CONFIG_DEPRECATED
help
Enable support for the old v0 style.
If your kernel is older than 2.1.117, then v0 support is the
only option.
config BUSYBOX_CONFIG_MORE config BUSYBOX_CONFIG_MORE
bool "more" bool "more"
default y default y
@ -299,7 +324,7 @@ config BUSYBOX_CONFIG_MORE
any need to reading text files, you can leave this disabled. any need to reading text files, you can leave this disabled.
config BUSYBOX_CONFIG_FEATURE_USE_TERMIOS config BUSYBOX_CONFIG_FEATURE_USE_TERMIOS
bool " Use termios to manipulate the screen" bool "Use termios to manipulate the screen"
default y default y
depends on BUSYBOX_CONFIG_MORE depends on BUSYBOX_CONFIG_MORE
help help
@ -321,7 +346,7 @@ config BUSYBOX_CONFIG_MOUNT
the 'mount' utility. the 'mount' utility.
config BUSYBOX_CONFIG_FEATURE_MOUNT_NFS config BUSYBOX_CONFIG_FEATURE_MOUNT_NFS
bool " Support mounting NFS file systems" bool "Support mounting NFS file systems"
default y default y
depends on BUSYBOX_CONFIG_MOUNT depends on BUSYBOX_CONFIG_MOUNT
help help
@ -403,7 +428,7 @@ config BUSYBOX_CONFIG_UMOUNT
also want to enable 'umount'. also want to enable 'umount'.
config BUSYBOX_CONFIG_FEATURE_UMOUNT_ALL config BUSYBOX_CONFIG_FEATURE_UMOUNT_ALL
bool " umount -a option" bool "umount -a option"
default y default y
depends on BUSYBOX_CONFIG_UMOUNT depends on BUSYBOX_CONFIG_UMOUNT
help help
@ -413,7 +438,7 @@ comment "Common options for mount/umount"
depends on BUSYBOX_CONFIG_MOUNT || BUSYBOX_CONFIG_UMOUNT depends on BUSYBOX_CONFIG_MOUNT || BUSYBOX_CONFIG_UMOUNT
config BUSYBOX_CONFIG_FEATURE_MOUNT_LOOP config BUSYBOX_CONFIG_FEATURE_MOUNT_LOOP
bool " Support loopback mounts" bool "Support loopback mounts"
default y default y
depends on BUSYBOX_CONFIG_MOUNT || BUSYBOX_CONFIG_UMOUNT depends on BUSYBOX_CONFIG_MOUNT || BUSYBOX_CONFIG_UMOUNT
help help
@ -429,7 +454,7 @@ config BUSYBOX_CONFIG_FEATURE_MOUNT_LOOP
(If you don't want umount to free the loop device, use "umount -D".) (If you don't want umount to free the loop device, use "umount -D".)
config BUSYBOX_CONFIG_FEATURE_MTAB_SUPPORT config BUSYBOX_CONFIG_FEATURE_MTAB_SUPPORT
bool " Support for the old /etc/mtab file" bool "Support for the old /etc/mtab file"
default n default n
depends on BUSYBOX_CONFIG_MOUNT || BUSYBOX_CONFIG_UMOUNT depends on BUSYBOX_CONFIG_MOUNT || BUSYBOX_CONFIG_UMOUNT
help help
@ -445,7 +470,11 @@ config BUSYBOX_CONFIG_FEATURE_MTAB_SUPPORT
example a mount under chroot won't update it), can't handle modern example a mount under chroot won't update it), can't handle modern
features like separate per-process filesystem namespaces, requires features like separate per-process filesystem namespaces, requires
that your /etc directory be writeable, tends to get easily confused that your /etc directory be writeable, tends to get easily confused
by --bind or --move mounts, and so on. (In brief: avoid.) by --bind or --move mounts, won't update if you rename a directory
that contains a mount point, and so on. (In brief: avoid.)
About the only reason to use this is if you've removed /proc from
your kernel.
endmenu endmenu

View File

@ -1,18 +1,18 @@
diff -Nur busybox-1.1.1/include/applets.h busybox-1.1.1-owrt/include/applets.h diff -ruN busybox-1.2.0-old/include/applets.h busybox-1.2.0-new/include/applets.h
--- busybox-1.1.1/include/applets.h 2006-03-22 22:16:24.000000000 +0100 --- busybox-1.2.0-old/include/applets.h 2006-07-01 00:42:10.000000000 +0200
+++ busybox-1.1.1-owrt/include/applets.h 2006-04-01 18:23:43.000000000 +0200 +++ busybox-1.2.0-new/include/applets.h 2006-07-31 00:29:34.000000000 +0200
@@ -154,6 +154,7 @@ @@ -157,6 +157,7 @@
USE_IPTUNNEL(APPLET(iptunnel, iptunnel_main, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_IPTUNNEL(APPLET(iptunnel, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_KILL(APPLET(kill, kill_main, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_KILL(APPLET(kill, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_KILLALL(APPLET(killall, kill_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_KILLALL(APPLET_ODDNAME(killall, kill, _BB_DIR_USR_BIN, _BB_SUID_NEVER, killall))
+USE_KILLALL5(APPLET(killall5, kill_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) +USE_KILLALL5(APPLET_ODDNAME(killall5, kill, _BB_DIR_USR_BIN, _BB_SUID_NEVER, killall5))
USE_KLOGD(APPLET(klogd, klogd_main, _BB_DIR_SBIN, _BB_SUID_NEVER)) USE_KLOGD(APPLET(klogd, _BB_DIR_SBIN, _BB_SUID_NEVER))
USE_LASH(APPLET(lash, lash_main, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_LASH(APPLET(lash, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_LAST(APPLET(last, last_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_LAST(APPLET(last, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
diff -Nur busybox-1.1.1/include/usage.h busybox-1.1.1-owrt/include/usage.h diff -ruN busybox-1.2.0-old/include/usage.h busybox-1.2.0-new/include/usage.h
--- busybox-1.1.1/include/usage.h 2006-03-22 22:16:24.000000000 +0100 --- busybox-1.2.0-old/include/usage.h 2006-07-01 00:42:10.000000000 +0200
+++ busybox-1.1.1-owrt/include/usage.h 2006-04-01 18:22:53.000000000 +0200 +++ busybox-1.2.0-new/include/usage.h 2006-07-31 00:25:57.000000000 +0200
@@ -1598,6 +1598,13 @@ @@ -1503,6 +1503,13 @@
#define killall_example_usage \ #define killall_example_usage \
"$ killall apache\n" "$ killall apache\n"
@ -26,9 +26,9 @@ diff -Nur busybox-1.1.1/include/usage.h busybox-1.1.1-owrt/include/usage.h
#define klogd_trivial_usage \ #define klogd_trivial_usage \
"[-c n] [-n]" "[-c n] [-n]"
#define klogd_full_usage \ #define klogd_full_usage \
diff -Nur busybox-1.1.1/procps/Config.in busybox-1.1.1-owrt/procps/Config.in diff -ruN busybox-1.2.0-old/procps/Config.in busybox-1.2.0-new/procps/Config.in
--- busybox-1.1.1/procps/Config.in 2006-03-22 22:16:25.000000000 +0100 --- busybox-1.2.0-old/procps/Config.in 2006-07-01 00:42:12.000000000 +0200
+++ busybox-1.1.1-owrt/procps/Config.in 2006-04-01 18:22:53.000000000 +0200 +++ busybox-1.2.0-new/procps/Config.in 2006-07-31 00:25:57.000000000 +0200
@@ -38,6 +38,11 @@ @@ -38,6 +38,11 @@
specified commands. If no signal name is specified, SIGTERM is specified commands. If no signal name is specified, SIGTERM is
sent. sent.
@ -41,10 +41,10 @@ diff -Nur busybox-1.1.1/procps/Config.in busybox-1.1.1-owrt/procps/Config.in
config CONFIG_PIDOF config CONFIG_PIDOF
bool "pidof" bool "pidof"
default n default n
diff -Nur busybox-1.1.1/procps/kill.c busybox-1.1.1-owrt/procps/kill.c diff -ruN busybox-1.2.0-old/procps/kill.c busybox-1.2.0-new/procps/kill.c
--- busybox-1.1.1/procps/kill.c 2006-03-22 22:16:25.000000000 +0100 --- busybox-1.2.0-old/procps/kill.c 2006-07-01 00:42:12.000000000 +0200
+++ busybox-1.1.1-owrt/procps/kill.c 2006-04-01 18:22:53.000000000 +0200 +++ busybox-1.2.0-new/procps/kill.c 2006-07-31 00:25:57.000000000 +0200
@@ -34,6 +34,7 @@ @@ -20,6 +20,7 @@
#define KILL 0 #define KILL 0
#define KILLALL 1 #define KILLALL 1
@ -52,7 +52,7 @@ diff -Nur busybox-1.1.1/procps/kill.c busybox-1.1.1-owrt/procps/kill.c
int kill_main(int argc, char **argv) int kill_main(int argc, char **argv)
{ {
@@ -48,6 +49,9 @@ @@ -34,6 +35,9 @@
#else #else
whichApp = KILL; whichApp = KILL;
#endif #endif
@ -62,7 +62,7 @@ diff -Nur busybox-1.1.1/procps/kill.c busybox-1.1.1-owrt/procps/kill.c
/* Parse any options */ /* Parse any options */
if (argc < 2) if (argc < 2)
@@ -126,6 +130,20 @@ @@ -112,6 +116,20 @@
} }
} }

View File

@ -1,7 +1,7 @@
diff -ur busybox-1.1.0/networking/telnetd.c busybox-1.1.0-owrt/networking/telnetd.c diff -ruN busybox-1.2.0-old/networking/telnetd.c busybox-1.2.0-new/networking/telnetd.c
--- busybox-1.1.0/networking/telnetd.c 2006-01-11 06:43:51.000000000 +0100 --- busybox-1.2.0-old/networking/telnetd.c 2006-07-01 00:42:02.000000000 +0200
+++ busybox-1.1.0-owrt/networking/telnetd.c 2006-01-14 17:41:20.000000000 +0100 +++ busybox-1.2.0-new/networking/telnetd.c 2006-07-31 10:52:30.000000000 +0200
@@ -45,6 +45,7 @@ @@ -44,6 +44,7 @@
#include <arpa/telnet.h> #include <arpa/telnet.h>
#include <ctype.h> #include <ctype.h>
#include <sys/syslog.h> #include <sys/syslog.h>
@ -9,7 +9,7 @@ diff -ur busybox-1.1.0/networking/telnetd.c busybox-1.1.0-owrt/networking/telnet
#include "busybox.h" #include "busybox.h"
@@ -394,11 +395,13 @@ @@ -391,11 +392,13 @@
struct in_addr bind_addr = { .s_addr = 0x0 }; struct in_addr bind_addr = { .s_addr = 0x0 };
#endif /* CONFIG_FEATURE_TELNETD_INETD */ #endif /* CONFIG_FEATURE_TELNETD_INETD */
int c; int c;
@ -25,7 +25,7 @@ diff -ur busybox-1.1.0/networking/telnetd.c busybox-1.1.0-owrt/networking/telnet
#endif /* CONFIG_FEATURE_TELNETD_INETD */ #endif /* CONFIG_FEATURE_TELNETD_INETD */
int maxlen, w, r; int maxlen, w, r;
@@ -413,6 +416,9 @@ @@ -410,6 +413,9 @@
case 'f': case 'f':
issuefile = optarg; issuefile = optarg;
break; break;
@ -35,17 +35,17 @@ diff -ur busybox-1.1.0/networking/telnetd.c busybox-1.1.0-owrt/networking/telnet
case 'l': case 'l':
loginpath = optarg; loginpath = optarg;
break; break;
@@ -465,6 +471,13 @@ @@ -459,6 +465,13 @@
sa.sin_addr = bind_addr; sa.sin_addr = bind_addr;
#endif #endif
+ /* Set it to listen on the specified interface */ + /* Set it to listen on the specified interface */
+ if (interface_name) { + if (interface_name) {
+ strncpy(interface.ifr_ifrn.ifrn_name, interface_name, IFNAMSIZ); + strncpy(interface.ifr_ifrn.ifrn_name, interface_name, IFNAMSIZ);
+ (void)setsockopt(master_fd, SOL_SOCKET, + (void)setsockopt(master_fd, SOL_SOCKET,
+ SO_BINDTODEVICE, &interface, sizeof(interface)); + SO_BINDTODEVICE, &interface, sizeof(interface));
+ } + }
+ +
if (bind(master_fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) { bb_xbind(master_fd, (struct sockaddr *) &sa, sizeof(sa));
bb_perror_msg_and_die("bind"); bb_xlisten(master_fd, 1);
} bb_xdaemon(0, 0);

View File

@ -1,7 +1,7 @@
diff -Nur busybox-1.1.1/include/usage.h busybox-1.1.1-owrt/include/usage.h diff -ruN busybox-1.2.0-old/include/usage.h busybox-1.2.0-new/include/usage.h
--- busybox-1.1.1/include/usage.h 2006-04-01 18:26:21.000000000 +0200 --- busybox-1.2.0-old/include/usage.h 2006-07-31 10:47:56.000000000 +0200
+++ busybox-1.1.1-owrt/include/usage.h 2006-04-01 18:27:45.000000000 +0200 +++ busybox-1.2.0-new/include/usage.h 2006-07-31 11:08:49.000000000 +0200
@@ -3268,6 +3268,7 @@ @@ -3190,6 +3190,7 @@
"\t-n,\t--now\tExit with failure if lease cannot be immediately negotiated\n" \ "\t-n,\t--now\tExit with failure if lease cannot be immediately negotiated\n" \
"\t-p,\t--pidfile=file\tStore process ID of daemon in file\n" \ "\t-p,\t--pidfile=file\tStore process ID of daemon in file\n" \
"\t-q,\t--quit\tQuit after obtaining lease\n" \ "\t-q,\t--quit\tQuit after obtaining lease\n" \
@ -9,10 +9,10 @@ diff -Nur busybox-1.1.1/include/usage.h busybox-1.1.1-owrt/include/usage.h
"\t-r,\t--request=IP\tIP address to request (default: none)\n" \ "\t-r,\t--request=IP\tIP address to request (default: none)\n" \
"\t-s,\t--script=file\tRun file at dhcp events (default: /usr/share/udhcpc/default.script)\n" \ "\t-s,\t--script=file\tRun file at dhcp events (default: /usr/share/udhcpc/default.script)\n" \
"\t-t,\t--retries=NUM\tSend up to NUM request packets\n"\ "\t-t,\t--retries=NUM\tSend up to NUM request packets\n"\
diff -Nur busybox-1.1.1/networking/udhcp/dhcpc.c busybox-1.1.1-owrt/networking/udhcp/dhcpc.c diff -ruN busybox-1.2.0-old/networking/udhcp/dhcpc.c busybox-1.2.0-new/networking/udhcp/dhcpc.c
--- busybox-1.1.1/networking/udhcp/dhcpc.c 2006-03-22 22:16:19.000000000 +0100 --- busybox-1.2.0-old/networking/udhcp/dhcpc.c 2006-07-01 00:42:02.000000000 +0200
+++ busybox-1.1.1-owrt/networking/udhcp/dhcpc.c 2006-04-01 18:28:19.000000000 +0200 +++ busybox-1.2.0-new/networking/udhcp/dhcpc.c 2006-07-31 11:08:49.000000000 +0200
@@ -49,6 +49,7 @@ @@ -47,6 +47,7 @@
.abort_if_no_lease = 0, .abort_if_no_lease = 0,
.foreground = 0, .foreground = 0,
.quit_after_lease = 0, .quit_after_lease = 0,
@ -20,15 +20,7 @@ diff -Nur busybox-1.1.1/networking/udhcp/dhcpc.c busybox-1.1.1-owrt/networking/u
.background_if_no_lease = 0, .background_if_no_lease = 0,
.interface = "eth0", .interface = "eth0",
.pidfile = NULL, .pidfile = NULL,
@@ -82,6 +83,7 @@ @@ -163,6 +164,7 @@
" immediately negotiated.\n"
" -p, --pidfile=file Store process ID of daemon in file\n"
" -q, --quit Quit after obtaining lease\n"
+" -R, --release Release IP on quit\n"
" -r, --request=IP IP address to request (default: none)\n"
" -s, --script=file Run file at dhcp events (default:\n"
" " DEFAULT_SCRIPT ")\n"
@@ -203,6 +205,7 @@
{"now", no_argument, 0, 'n'}, {"now", no_argument, 0, 'n'},
{"pidfile", required_argument, 0, 'p'}, {"pidfile", required_argument, 0, 'p'},
{"quit", no_argument, 0, 'q'}, {"quit", no_argument, 0, 'q'},
@ -36,7 +28,7 @@ diff -Nur busybox-1.1.1/networking/udhcp/dhcpc.c busybox-1.1.1-owrt/networking/u
{"request", required_argument, 0, 'r'}, {"request", required_argument, 0, 'r'},
{"script", required_argument, 0, 's'}, {"script", required_argument, 0, 's'},
{"timeout", required_argument, 0, 'T'}, {"timeout", required_argument, 0, 'T'},
@@ -214,7 +217,7 @@ @@ -174,7 +176,7 @@
/* get options */ /* get options */
while (1) { while (1) {
int option_index = 0; int option_index = 0;
@ -45,7 +37,7 @@ diff -Nur busybox-1.1.1/networking/udhcp/dhcpc.c busybox-1.1.1-owrt/networking/u
if (c == -1) break; if (c == -1) break;
switch (c) { switch (c) {
@@ -284,6 +287,9 @@ @@ -244,6 +246,9 @@
case 'q': case 'q':
client_config.quit_after_lease = 1; client_config.quit_after_lease = 1;
break; break;
@ -55,7 +47,7 @@ diff -Nur busybox-1.1.1/networking/udhcp/dhcpc.c busybox-1.1.1-owrt/networking/u
case 'r': case 'r':
requested_ip = inet_addr(optarg); requested_ip = inet_addr(optarg);
break; break;
@@ -527,8 +533,11 @@ @@ -488,8 +493,11 @@
state = BOUND; state = BOUND;
change_mode(LISTEN_NONE); change_mode(LISTEN_NONE);
@ -68,7 +60,7 @@ diff -Nur busybox-1.1.1/networking/udhcp/dhcpc.c busybox-1.1.1-owrt/networking/u
if (!client_config.foreground) if (!client_config.foreground)
client_background(); client_background();
@@ -553,12 +562,13 @@ @@ -514,12 +522,13 @@
case SIGUSR1: case SIGUSR1:
perform_renew(); perform_renew();
break; break;
@ -85,10 +77,10 @@ diff -Nur busybox-1.1.1/networking/udhcp/dhcpc.c busybox-1.1.1-owrt/networking/u
} }
} else if (retval == -1 && errno == EINTR) { } else if (retval == -1 && errno == EINTR) {
/* a signal was caught */ /* a signal was caught */
diff -Nur busybox-1.1.1/networking/udhcp/dhcpc.h busybox-1.1.1-owrt/networking/udhcp/dhcpc.h diff -ruN busybox-1.2.0-old/networking/udhcp/dhcpc.h busybox-1.2.0-new/networking/udhcp/dhcpc.h
--- busybox-1.1.1/networking/udhcp/dhcpc.h 2006-03-22 22:16:19.000000000 +0100 --- busybox-1.2.0-old/networking/udhcp/dhcpc.h 2006-07-01 00:42:02.000000000 +0200
+++ busybox-1.1.1-owrt/networking/udhcp/dhcpc.h 2006-04-01 18:27:45.000000000 +0200 +++ busybox-1.2.0-new/networking/udhcp/dhcpc.h 2006-07-31 11:08:49.000000000 +0200
@@ -19,6 +19,7 @@ @@ -18,6 +18,7 @@
struct client_config_t { struct client_config_t {
char foreground; /* Do not fork */ char foreground; /* Do not fork */
char quit_after_lease; /* Quit after obtaining lease */ char quit_after_lease; /* Quit after obtaining lease */

View File

@ -1,21 +1,23 @@
# Copyright (C) 2006 OpenWrt.org
Copyright (C) 2006 OpenWrt.org #
# This is free software, licensed under the GNU General Public License v2.
diff -Nur busybox-1.1.1/include/applets.h busybox-1.1.1-owrt/include/applets.h # See /LICENSE for more information.
--- busybox-1.1.1/include/applets.h 2006-04-01 18:26:21.000000000 +0200 #
+++ busybox-1.1.1-owrt/include/applets.h 2006-04-01 18:36:28.000000000 +0200 diff -ruN busybox-1.2.0-old/include/applets.h busybox-1.2.0-new/include/applets.h
@@ -197,6 +197,7 @@ --- busybox-1.2.0-old/include/applets.h 2006-07-31 10:47:56.000000000 +0200
USE_MV(APPLET(mv, mv_main, _BB_DIR_BIN, _BB_SUID_NEVER)) +++ busybox-1.2.0-new/include/applets.h 2006-07-31 11:21:00.000000000 +0200
USE_NAMEIF(APPLET(nameif, nameif_main, _BB_DIR_SBIN, _BB_SUID_NEVER)) @@ -200,6 +200,7 @@
USE_NC(APPLET(nc, nc_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_MV(APPLET(mv, _BB_DIR_BIN, _BB_SUID_NEVER))
+USE_NETMSG(APPLET_NOUSAGE(netmsg, netmsg_main, _BB_DIR_BIN, _BB_SUID_ALWAYS)) USE_NAMEIF(APPLET(nameif, _BB_DIR_SBIN, _BB_SUID_NEVER))
USE_NETSTAT(APPLET(netstat, netstat_main, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_NC(APPLET(nc, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_NICE(APPLET(nice, nice_main, _BB_DIR_BIN, _BB_SUID_NEVER)) +USE_NETMSG(APPLET_NOUSAGE(netmsg, netmsg, _BB_DIR_BIN, _BB_SUID_ALWAYS))
USE_NOHUP(APPLET(nohup, nohup_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_NETSTAT(APPLET(netstat, _BB_DIR_BIN, _BB_SUID_NEVER))
diff -Nur busybox-1.1.1/networking/Config.in busybox-1.1.1-owrt/networking/Config.in USE_NICE(APPLET(nice, _BB_DIR_BIN, _BB_SUID_NEVER))
--- busybox-1.1.1/networking/Config.in 2006-03-22 22:16:19.000000000 +0100 USE_NOHUP(APPLET(nohup, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+++ busybox-1.1.1-owrt/networking/Config.in 2006-04-01 18:35:32.000000000 +0200 diff -ruN busybox-1.2.0-old/networking/Config.in busybox-1.2.0-new/networking/Config.in
@@ -451,6 +451,12 @@ --- busybox-1.2.0-old/networking/Config.in 2006-07-01 00:42:02.000000000 +0200
+++ busybox-1.2.0-new/networking/Config.in 2006-07-31 11:18:01.000000000 +0200
@@ -445,6 +445,12 @@
help help
A simple Unix utility which reads and writes data across network A simple Unix utility which reads and writes data across network
connections. connections.
@ -28,9 +30,9 @@ diff -Nur busybox-1.1.1/networking/Config.in busybox-1.1.1-owrt/networking/Confi
config CONFIG_NC_GAPING_SECURITY_HOLE config CONFIG_NC_GAPING_SECURITY_HOLE
bool "gaping security hole" bool "gaping security hole"
diff -Nur busybox-1.1.1/networking/Makefile.in busybox-1.1.1-owrt/networking/Makefile.in diff -ruN busybox-1.2.0-old/networking/Makefile.in busybox-1.2.0-new/networking/Makefile.in
--- busybox-1.1.1/networking/Makefile.in 2006-03-22 22:16:19.000000000 +0100 --- busybox-1.2.0-old/networking/Makefile.in 2006-07-01 00:42:02.000000000 +0200
+++ busybox-1.1.1-owrt/networking/Makefile.in 2006-04-01 18:35:32.000000000 +0200 +++ busybox-1.2.0-new/networking/Makefile.in 2006-07-31 11:18:01.000000000 +0200
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
NETWORKING-$(CONFIG_IPTUNNEL) += iptunnel.o NETWORKING-$(CONFIG_IPTUNNEL) += iptunnel.o
NETWORKING-$(CONFIG_NAMEIF) += nameif.o NETWORKING-$(CONFIG_NAMEIF) += nameif.o
@ -39,9 +41,9 @@ diff -Nur busybox-1.1.1/networking/Makefile.in busybox-1.1.1-owrt/networking/Mak
NETWORKING-$(CONFIG_NETSTAT) += netstat.o NETWORKING-$(CONFIG_NETSTAT) += netstat.o
NETWORKING-$(CONFIG_NSLOOKUP) += nslookup.o NETWORKING-$(CONFIG_NSLOOKUP) += nslookup.o
NETWORKING-$(CONFIG_PING) += ping.o NETWORKING-$(CONFIG_PING) += ping.o
diff -Nur busybox-1.1.1/networking/netmsg.c busybox-1.1.1-owrt/networking/netmsg.c diff -ruN busybox-1.2.0-old/networking/netmsg.c busybox-1.2.0-new/networking/netmsg.c
--- busybox-1.1.1/networking/netmsg.c 1970-01-01 01:00:00.000000000 +0100 --- busybox-1.2.0-old/networking/netmsg.c 1970-01-01 01:00:00.000000000 +0100
+++ busybox-1.1.1-owrt/networking/netmsg.c 2006-04-01 18:35:32.000000000 +0200 +++ busybox-1.2.0-new/networking/netmsg.c 2006-07-31 11:18:01.000000000 +0200
@@ -0,0 +1,63 @@ @@ -0,0 +1,63 @@
+/* +/*
+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org> + * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>

View File

@ -1,28 +1,20 @@
# Copyright (C) 2006 OpenWrt.org
Copyright (C) 2006 OpenWrt.org #
# This is free software, licensed under the GNU General Public License v2.
--- busybox-1.1.1/networking/httpd.c 2006-03-22 22:16:19.000000000 +0100 # See /LICENSE for more information.
+++ busybox-1.1.1.new/networking/httpd.c 2006-04-01 19:41:42.150744624 +0200 #
@@ -110,6 +110,7 @@ diff -ruN busybox-1.2.0-old/networking/httpd.c busybox-1.2.0-new/networking/httpd.c
--- busybox-1.2.0-old/networking/httpd.c 2006-07-01 00:42:02.000000000 +0200
+++ busybox-1.2.0-new/networking/httpd.c 2006-08-01 10:06:58.000000000 +0200
@@ -99,6 +99,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> /* for connect and socket*/ #include <sys/socket.h> /* for connect and socket*/
#include <netinet/in.h> /* for sockaddr_in */ #include <netinet/in.h> /* for sockaddr_in */
+#include <arpa/inet.h> +#include <arpa/inet.h>
#include <sys/time.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/wait.h> #include <sys/wait.h>
@@ -204,8 +205,8 @@ #include <fcntl.h> /* for open modes */
@@ -165,6 +166,7 @@
void bb_show_usage(void)
{
- fprintf(stderr, "Usage: %s [-p <port>] [-c configFile] [-d/-e <string>] "
- "[-r realm] [-u user] [-h homedir]\n", bb_applet_name);
+ fprintf(stderr, "Usage: %s [-p <port>] [-l <IP address>] [-c configFile]"
+ "[-d/-e <string>] [-r realm] [-u user] [-h homedir]\n", bb_applet_name);
exit(1);
}
#endif
@@ -255,6 +256,7 @@
#endif #endif
unsigned port; /* server initial port and for unsigned port; /* server initial port and for
set env REMOTE_PORT */ set env REMOTE_PORT */
@ -30,7 +22,7 @@
union HTTPD_FOUND { union HTTPD_FOUND {
const char *found_mime_type; const char *found_mime_type;
const char *found_moved_temporarily; const char *found_moved_temporarily;
@@ -958,7 +960,10 @@ @@ -868,7 +870,10 @@
/* inet_addr() returns a value that is already in network order */ /* inet_addr() returns a value that is already in network order */
memset(&lsocket, 0, sizeof(lsocket)); memset(&lsocket, 0, sizeof(lsocket));
lsocket.sin_family = AF_INET; lsocket.sin_family = AF_INET;
@ -39,61 +31,61 @@
+ if (config->address != NULL) lsocket.sin_addr.s_addr = ((struct in_addr *) ((gethostbyname(config->address))->h_addr))->s_addr; + if (config->address != NULL) lsocket.sin_addr.s_addr = ((struct in_addr *) ((gethostbyname(config->address))->h_addr))->s_addr;
+ else lsocket.sin_addr.s_addr = htons(INADDR_ANY); + else lsocket.sin_addr.s_addr = htons(INADDR_ANY);
+ } + }
lsocket.sin_port = htons(config->port) ; lsocket.sin_port = htons(config->port);
fd = socket(AF_INET, SOCK_STREAM, 0); fd = bb_xsocket(AF_INET, SOCK_STREAM, 0);
if (fd >= 0) { /* tell the OS it's OK to reuse a previous address even though */
@@ -1996,6 +2001,7 @@ @@ -1899,6 +1904,7 @@
USE_FEATURE_HTTPD_AUTH_MD5(m_opt_md5,) USE_FEATURE_HTTPD_AUTH_MD5(m_opt_md5,)
USE_FEATURE_HTTPD_SETUID(u_opt_setuid,) USE_FEATURE_HTTPD_SETUID(u_opt_setuid,)
SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(p_opt_port,) USE_FEATURE_HTTPD_WITHOUT_INETD(p_opt_port,)
+ SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(l_opt_addr,) + USE_FEATURE_HTTPD_WITHOUT_INETD(l_opt_addr,)
}; };
static const char httpd_opts[]="c:d:h:" static const char httpd_opts[]="c:d:h:"
@@ -2003,7 +2009,7 @@ @@ -1906,7 +1912,7 @@
USE_FEATURE_HTTPD_BASIC_AUTH("r:") USE_FEATURE_HTTPD_BASIC_AUTH("r:")
USE_FEATURE_HTTPD_AUTH_MD5("m:") USE_FEATURE_HTTPD_AUTH_MD5("m:")
USE_FEATURE_HTTPD_SETUID("u:") USE_FEATURE_HTTPD_SETUID("u:")
- SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY("p:"); - USE_FEATURE_HTTPD_WITHOUT_INETD("p:");
+ SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY("p:l:"); + USE_FEATURE_HTTPD_WITHOUT_INETD("p:l:");
#define OPT_CONFIG_FILE (1<<c_opt_config_file) #define OPT_CONFIG_FILE (1<<c_opt_config_file)
#define OPT_DECODE_URL (1<<d_opt_decode_url) #define OPT_DECODE_URL (1<<d_opt_decode_url)
@@ -2024,6 +2030,8 @@ @@ -1927,6 +1933,8 @@
#define OPT_PORT SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY((1<<p_opt_port)) \ #define OPT_PORT USE_FEATURE_HTTPD_WITHOUT_INETD((1<<p_opt_port)) \
USE_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(0) SKIP_FEATURE_HTTPD_WITHOUT_INETD(0)
+#define OPT_ADDRESS SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY((1<<l_opt_addr)) \ +#define OPT_ADDRESS USE_FEATURE_HTTPD_WITHOUT_INETD((1<<l_opt_addr)) \
+ USE_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(0) + SKIP_FEATURE_HTTPD_WITHOUT_INETD(0)
#ifdef HTTPD_STANDALONE int httpd_main(int argc, char *argv[])
int main(int argc, char *argv[]) {
@@ -2036,6 +2044,7 @@ @@ -1935,6 +1943,7 @@
char *url_for_decode; char *url_for_decode;
USE_FEATURE_HTTPD_ENCODE_URL_STR(const char *url_for_encode;) USE_FEATURE_HTTPD_ENCODE_URL_STR(const char *url_for_encode;)
SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(const char *s_port;) USE_FEATURE_HTTPD_WITHOUT_INETD(const char *s_port;)
+ SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(const char *s_addr;) + USE_FEATURE_HTTPD_WITHOUT_INETD(const char *s_addr;)
SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(int server;) USE_FEATURE_HTTPD_WITHOUT_INETD(int server;)
USE_FEATURE_HTTPD_SETUID(const char *s_uid;) USE_FEATURE_HTTPD_SETUID(const char *s_uid;)
@@ -2050,6 +2059,7 @@ @@ -1949,6 +1958,7 @@
#ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY #ifdef CONFIG_FEATURE_HTTPD_WITHOUT_INETD
config->port = 80; config->port = 80;
+ config->address = ""; + config->address = "";
#endif #endif
config->ContentLength = -1; config->ContentLength = -1;
@@ -2061,6 +2071,7 @@ @@ -1960,6 +1970,7 @@
USE_FEATURE_HTTPD_AUTH_MD5(, &pass) USE_FEATURE_HTTPD_AUTH_MD5(, &pass)
USE_FEATURE_HTTPD_SETUID(, &s_uid) USE_FEATURE_HTTPD_SETUID(, &s_uid)
SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(, &s_port) USE_FEATURE_HTTPD_WITHOUT_INETD(, &s_port)
+ SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(, &s_addr) + USE_FEATURE_HTTPD_WITHOUT_INETD(, &s_addr)
); );
if(opt & OPT_DECODE_URL) { if(opt & OPT_DECODE_URL) {
@@ -2082,6 +2093,8 @@ @@ -1981,6 +1992,8 @@
#ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY #ifdef CONFIG_FEATURE_HTTPD_WITHOUT_INETD
if(opt & OPT_PORT) if(opt & OPT_PORT)
config->port = bb_xgetlarg(s_port, 10, 1, 0xffff); config->port = bb_xgetlarg(s_port, 10, 1, 0xffff);
+ if (opt & OPT_ADDRESS) + if (opt & OPT_ADDRESS)

View File

@ -1,21 +1,23 @@
# Copyright (C) 2006 OpenWrt.org
Copyright (C) 2006 OpenWrt.org #
# This is free software, licensed under the GNU General Public License v2.
diff -urN busybox.old/include/applets.h busybox.dev/include/applets.h # See /LICENSE for more information.
--- busybox.old/include/applets.h 2006-04-05 01:06:29.000000000 +0200 #
+++ busybox.dev/include/applets.h 2006-04-05 01:19:09.000000000 +0200 diff -ruN busybox-1.2.0-old/include/applets.h busybox-1.2.0-new/include/applets.h
@@ -167,6 +167,7 @@ --- busybox-1.2.0-old/include/applets.h 2006-07-31 11:21:00.000000000 +0200
USE_LN(APPLET(ln, ln_main, _BB_DIR_BIN, _BB_SUID_NEVER)) +++ busybox-1.2.0-new/include/applets.h 2006-08-01 10:21:15.000000000 +0200
USE_LOADFONT(APPLET(loadfont, loadfont_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) @@ -169,6 +169,7 @@
USE_LOADKMAP(APPLET(loadkmap, loadkmap_main, _BB_DIR_SBIN, _BB_SUID_NEVER)) USE_LN(APPLET(ln, _BB_DIR_BIN, _BB_SUID_NEVER))
+USE_LOCK(APPLET_NOUSAGE(lock, lock_main, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_LOADFONT(APPLET(loadfont, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_LOGGER(APPLET(logger, logger_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_NEVER))
USE_LOGIN(APPLET(login, login_main, _BB_DIR_BIN, _BB_SUID_ALWAYS)) +USE_LOCK(APPLET_NOUSAGE(lock, lock, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_LOGNAME(APPLET(logname, logname_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_LOGGER(APPLET(logger, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
diff -urN busybox.old/miscutils/Config.in busybox.dev/miscutils/Config.in USE_LOGIN(APPLET(login, _BB_DIR_BIN, _BB_SUID_ALWAYS))
--- busybox.old/miscutils/Config.in 2006-03-22 22:16:24.000000000 +0100 USE_LOGNAME(APPLET(logname, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+++ busybox.dev/miscutils/Config.in 2006-04-05 01:07:12.000000000 +0200 diff -ruN busybox-1.2.0-old/miscutils/Config.in busybox-1.2.0-new/miscutils/Config.in
@@ -209,6 +209,12 @@ --- busybox-1.2.0-old/miscutils/Config.in 2006-07-01 00:42:09.000000000 +0200
+++ busybox-1.2.0-new/miscutils/Config.in 2006-08-01 10:21:15.000000000 +0200
@@ -231,6 +231,12 @@
Enables the 'hdparm -d' option to get/set using_dma flag. Enables the 'hdparm -d' option to get/set using_dma flag.
This is dangerous stuff, so you should probably say N. This is dangerous stuff, so you should probably say N.
@ -28,20 +30,9 @@ diff -urN busybox.old/miscutils/Config.in busybox.dev/miscutils/Config.in
config CONFIG_MAKEDEVS config CONFIG_MAKEDEVS
bool "makedevs" bool "makedevs"
default n default n
diff -urN busybox.old/miscutils/Makefile.in busybox.dev/miscutils/Makefile.in diff -ruN busybox-1.2.0-old/miscutils/lock.c busybox-1.2.0-new/miscutils/lock.c
--- busybox.old/miscutils/Makefile.in 2006-03-22 22:16:24.000000000 +0100 --- busybox-1.2.0-old/miscutils/lock.c 1970-01-01 01:00:00.000000000 +0100
+++ busybox.dev/miscutils/Makefile.in 2006-04-05 01:10:50.000000000 +0200 +++ busybox-1.2.0-new/miscutils/lock.c 2006-08-01 10:21:15.000000000 +0200
@@ -20,6 +20,7 @@
MISCUTILS-$(CONFIG_EJECT) += eject.o
MISCUTILS-$(CONFIG_HDPARM) += hdparm.o
MISCUTILS-$(CONFIG_LAST) += last.o
+MISCUTILS-$(CONFIG_LOCK) += lock.o
MISCUTILS-${CONFIG_LESS} += less.o
MISCUTILS-$(CONFIG_MAKEDEVS) += makedevs.o
MISCUTILS-$(CONFIG_MOUNTPOINT) += mountpoint.o
diff -urN busybox.old/miscutils/lock.c busybox.dev/miscutils/lock.c
--- busybox.old/miscutils/lock.c 1970-01-01 01:00:00.000000000 +0100
+++ busybox.dev/miscutils/lock.c 2006-04-05 01:07:12.000000000 +0200
@@ -0,0 +1,133 @@ @@ -0,0 +1,133 @@
+/* +/*
+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org> + * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
@ -176,3 +167,14 @@ diff -urN busybox.old/miscutils/lock.c busybox.dev/miscutils/lock.c
+ else + else
+ return do_lock(); + return do_lock();
+} +}
diff -ruN busybox-1.2.0-old/miscutils/Makefile.in busybox-1.2.0-new/miscutils/Makefile.in
--- busybox-1.2.0-old/miscutils/Makefile.in 2006-07-01 00:42:09.000000000 +0200
+++ busybox-1.2.0-new/miscutils/Makefile.in 2006-08-01 10:21:15.000000000 +0200
@@ -20,6 +20,7 @@
MISCUTILS-$(CONFIG_EJECT) += eject.o
MISCUTILS-$(CONFIG_HDPARM) += hdparm.o
MISCUTILS-$(CONFIG_LAST) += last.o
+MISCUTILS-$(CONFIG_LOCK) += lock.o
MISCUTILS-${CONFIG_LESS} += less.o
MISCUTILS-$(CONFIG_MAKEDEVS) += makedevs.o
MISCUTILS-$(CONFIG_MOUNTPOINT) += mountpoint.o

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,7 @@
# Copyright (C) 2006 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
# #
# remove (numerous) compile warnings # remove (numerous) compile warnings
# #

View File

@ -1,10 +1,14 @@
# Copyright (C) 2006 OpenWrt.org
# #
# expose (again) an hash_fd function (used 911-ipkg.patch) # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
# #
diff -ruN busybox-1.1.1-old/coreutils/md5_sha1_sum.c busybox-1.1.1-new/coreutils/md5_sha1_sum.c # expose (again) an hash_fd function (used in 911-ipkg.patch)
--- busybox-1.1.1-old/coreutils/md5_sha1_sum.c 2006-03-30 00:14:50.000000000 +0200 #
+++ busybox-1.1.1-new/coreutils/md5_sha1_sum.c 2006-03-29 23:46:51.000000000 +0200 diff -ruN busybox-1.2.0-orig/coreutils/md5_sha1_sum.c busybox-1.2.0-libbb_hash/coreutils/md5_sha1_sum.c
@@ -15,80 +15,10 @@ --- busybox-1.2.0-orig/coreutils/md5_sha1_sum.c 2006-07-01 00:42:07.000000000 +0200
+++ busybox-1.2.0-libbb_hash/coreutils/md5_sha1_sum.c 2006-07-22 17:08:02.000000000 +0200
@@ -16,79 +16,10 @@
#include "busybox.h" #include "busybox.h"
@ -40,81 +44,76 @@ diff -ruN busybox-1.1.1-old/coreutils/md5_sha1_sum.c busybox-1.1.1-new/coreutils
- RESERVE_CONFIG_UBUFFER(in_buf, 4096); - RESERVE_CONFIG_UBUFFER(in_buf, 4096);
- void (*update)(const void*, size_t, void*); - void (*update)(const void*, size_t, void*);
- void (*final)(void*, void*); - void (*final)(void*, void*);
- -
- if(strcmp(filename, "-") == 0) { - if (strcmp(filename, "-") == 0) {
- src_fd = STDIN_FILENO; - src_fd = STDIN_FILENO;
- } else if(0 > (src_fd = open(filename, O_RDONLY))) { - } else if(0 > (src_fd = open(filename, O_RDONLY))) {
- bb_perror_msg("%s", filename); - bb_perror_msg("%s", filename);
- return NULL; - return NULL;
- } - }
- -
- // figure specific hash algorithims - /* figure specific hash algorithims */
- if(ENABLE_MD5SUM && hash_algo==HASH_MD5) { - if (ENABLE_MD5SUM && hash_algo==HASH_MD5) {
- md5_begin(&context.md5); - md5_begin(&context.md5);
- update = (void (*)(const void*, size_t, void*))md5_hash; - update = (void (*)(const void*, size_t, void*))md5_hash;
- final = (void (*)(void*, void*))md5_end; - final = (void (*)(void*, void*))md5_end;
- hash_len = 16; - hash_len = 16;
- } else if(ENABLE_SHA1SUM && hash_algo==HASH_SHA1) { - } else if (ENABLE_SHA1SUM && hash_algo==HASH_SHA1) {
- sha1_begin(&context.sha1); - sha1_begin(&context.sha1);
- update = (void (*)(const void*, size_t, void*))sha1_hash; - update = (void (*)(const void*, size_t, void*))sha1_hash;
- final = (void (*)(void*, void*))sha1_end; - final = (void (*)(void*, void*))sha1_end;
- hash_len = 20; - hash_len = 20;
- } else { - } else {
- bb_error_msg_and_die("algotithm not supported"); - bb_error_msg_and_die("algorithm not supported");
- } - }
-
- -
- while(0 < (count = read(src_fd, in_buf, sizeof in_buf))) { - while (0 < (count = read(src_fd, in_buf, 4096))) {
- update(in_buf, count, &context); - update(in_buf, count, &context);
- } - }
- -
- if(count == 0) { - if (count == 0) {
- final(in_buf, &context); - final(in_buf, &context);
- hash_value = hash_bin_to_hex(in_buf, hash_len); - hash_value = hash_bin_to_hex(in_buf, hash_len);
- } - }
- -
- RELEASE_CONFIG_BUFFER(in_buf); - RELEASE_CONFIG_BUFFER(in_buf);
- -
- if(src_fd != STDIN_FILENO) { - if (src_fd != STDIN_FILENO) {
- close(src_fd); - close(src_fd);
- } - }
- -
- return hash_value; - return hash_value;
-} -}
- -
/* This could become a common function for md5 as well, by using md5_stream */ /* This could become a common function for md5 as well, by using md5_stream */
static int hash_files(int argc, char **argv, hash_algo_t hash_algo) static int hash_files(int argc, char **argv, hash_algo_t hash_algo)
{ {
diff -ruN busybox-1.1.1-old/include/libbb.h busybox-1.1.1-new/include/libbb.h diff -ruN busybox-1.2.0-orig/include/libbb.h busybox-1.2.0-libbb_hash/include/libbb.h
--- busybox-1.1.1-old/include/libbb.h 2006-03-30 00:14:50.000000000 +0200 --- busybox-1.2.0-orig/include/libbb.h 2006-07-01 00:42:10.000000000 +0200
+++ busybox-1.1.1-new/include/libbb.h 2006-03-30 00:31:48.000000000 +0200 +++ busybox-1.2.0-libbb_hash/include/libbb.h 2006-07-22 17:01:06.000000000 +0200
@@ -490,6 +490,12 @@ @@ -518,6 +518,8 @@
void md5_hash(const void *data, size_t length, md5_ctx_t *ctx); extern int get_terminal_width_height(int fd, int *width, int *height);
void *md5_end(void *resbuf, md5_ctx_t *ctx); extern unsigned long get_ug_id(const char *s, long (*__bb_getxxnam)(const char *));
+typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t; +typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
+ +
typedef struct _sha1_ctx_t_ {
uint32_t count[2];
uint32_t hash[5];
@@ -542,6 +544,10 @@
void md5_hash(const void *data, size_t length, md5_ctx_t *ctx);
void *md5_end(void *resbuf, md5_ctx_t *ctx);
+unsigned char *hash_bin_to_hex(unsigned char *hash_value, unsigned char hash_length); +unsigned char *hash_bin_to_hex(unsigned char *hash_value, unsigned char hash_length);
+int hash_fd(int fd, hash_algo_t hash_algo, uint8_t *hash_value); +int hash_fd(int fd, hash_algo_t hash_algo, uint8_t *hash_value);
+uint8_t *hash_file(const char *filename, hash_algo_t hash_algo); +uint8_t *hash_file(const char *filename, hash_algo_t hash_algo);
+ +
/* busybox.h will include dmalloc later for us, else include it here. */ extern uint32_t *bb_crc32_filltable (int endian);
#if !defined _BB_INTERNAL_H_ && defined DMALLOC
#include <dmalloc.h>
diff -ruN busybox-1.1.1-old/libbb/Makefile.in busybox-1.1.1-new/libbb/Makefile.in
--- busybox-1.1.1-old/libbb/Makefile.in 2006-03-30 00:14:50.000000000 +0200
+++ busybox-1.1.1-new/libbb/Makefile.in 2006-03-29 23:46:51.000000000 +0200
@@ -11,6 +11,7 @@
LIBBB-n:= #ifndef RB_POWER_OFF
LIBBB-y:= \ diff -ruN busybox-1.2.0-orig/libbb/hash.c busybox-1.2.0-libbb_hash/libbb/hash.c
+ hash.c \ --- busybox-1.2.0-orig/libbb/hash.c 1970-01-01 01:00:00.000000000 +0100
bb_asprintf.c ask_confirmation.c change_identity.c chomp.c \ +++ busybox-1.2.0-libbb_hash/libbb/hash.c 2006-07-22 17:07:34.000000000 +0200
compare_string_array.c concat_path_file.c copy_file.c copyfd.c \
create_icmp_socket.c create_icmp6_socket.c \
diff -ruN busybox-1.1.1-old/libbb/hash.c busybox-1.1.1-new/libbb/hash.c
--- busybox-1.1.1-old/libbb/hash.c 1970-01-01 01:00:00.000000000 +0100
+++ busybox-1.1.1-new/libbb/hash.c 2006-03-30 00:35:54.000000000 +0200
@@ -0,0 +1,100 @@ @@ -0,0 +1,100 @@
+/* +/*
+ * Copyright (C) 2003 Glenn L. McGrath + * Copyright (C) 2003 Glenn L. McGrath
@ -158,23 +157,23 @@ diff -ruN busybox-1.1.1-old/libbb/hash.c busybox-1.1.1-new/libbb/hash.c
+ void (*final)(void*, void*) = NULL; + void (*final)(void*, void*) = NULL;
+ +
+ // figure specific hash algorithims + // figure specific hash algorithims
+ if(hash_algo==HASH_MD5) { + if (hash_algo==HASH_MD5) {
+ md5_begin(&context.md5); + md5_begin(&context.md5);
+ update = (void (*)(const void*, size_t, void*))md5_hash; + update = (void (*)(const void*, size_t, void*))md5_hash;
+ final = (void (*)(void*, void*))md5_end; + final = (void (*)(void*, void*))md5_end;
+ } else if(hash_algo==HASH_SHA1) { + } else if (hash_algo==HASH_SHA1) {
+ sha1_begin(&context.sha1); + sha1_begin(&context.sha1);
+ update = (void (*)(const void*, size_t, void*))sha1_hash; + update = (void (*)(const void*, size_t, void*))sha1_hash;
+ final = (void (*)(void*, void*))sha1_end; + final = (void (*)(void*, void*))sha1_end;
+ } + }
+ +
+ +
+ while(0 < (count = read(fd, in_buf, sizeof in_buf))) { + while (0 < (count = read(fd, in_buf, sizeof in_buf))) {
+ update(in_buf, count, &context); + update(in_buf, count, &context);
+ result += count; + result += count;
+ } + }
+ +
+ if(count == 0) { + if (count == 0) {
+ final(hash_value, &context); + final(hash_value, &context);
+ } + }
+ +
@ -189,26 +188,26 @@ diff -ruN busybox-1.1.1-old/libbb/hash.c busybox-1.1.1-new/libbb/hash.c
+ RESERVE_CONFIG_UBUFFER(hash_buf, 20); + RESERVE_CONFIG_UBUFFER(hash_buf, 20);
+ uint8_t *hash_value = NULL; + uint8_t *hash_value = NULL;
+ +
+ if(ENABLE_MD5SUM && hash_algo==HASH_MD5) { + if (ENABLE_MD5SUM && hash_algo==HASH_MD5) {
+ hash_len = 16; + hash_len = 16;
+ } else if(ENABLE_SHA1SUM && hash_algo==HASH_SHA1) { + } else if (ENABLE_SHA1SUM && hash_algo==HASH_SHA1) {
+ hash_len = 20; + hash_len = 20;
+ } else { + } else {
+ bb_error_msg_and_die("algotithm not supported"); + bb_error_msg_and_die("algotithm not supported");
+ } + }
+ +
+ if(strcmp(filename, "-") == 0) { + if (strcmp(filename, "-") == 0) {
+ src_fd = STDIN_FILENO; + src_fd = STDIN_FILENO;
+ } else if(0 > (src_fd = open(filename, O_RDONLY))) { + } else if (0 > (src_fd = open(filename, O_RDONLY))) {
+ bb_perror_msg("%s", filename); + bb_perror_msg("%s", filename);
+ return NULL; + return NULL;
+ } + }
+ +
+ if(hash_fd(src_fd, hash_algo, hash_buf) > 0) { + if (hash_fd(src_fd, hash_algo, hash_buf) > 0) {
+ hash_value = hash_bin_to_hex(hash_buf, hash_len); + hash_value = hash_bin_to_hex(hash_buf, hash_len);
+ } + }
+ +
+ if(src_fd != STDIN_FILENO) { + if (src_fd != STDIN_FILENO) {
+ close(src_fd); + close(src_fd);
+ } + }
+ +
@ -216,3 +215,14 @@ diff -ruN busybox-1.1.1-old/libbb/hash.c busybox-1.1.1-new/libbb/hash.c
+ +
+ return hash_value; + return hash_value;
+} +}
diff -ruN busybox-1.2.0-orig/libbb/Makefile.in busybox-1.2.0-libbb_hash/libbb/Makefile.in
--- busybox-1.2.0-orig/libbb/Makefile.in 2006-07-01 00:42:08.000000000 +0200
+++ busybox-1.2.0-libbb_hash/libbb/Makefile.in 2006-07-22 16:51:47.000000000 +0200
@@ -11,6 +11,7 @@
LIBBB-n:=
LIBBB-y:= \
+ hash.c \
bb_asprintf.c ask_confirmation.c change_identity.c chomp.c \
compare_string_array.c concat_path_file.c copy_file.c copyfd.c \
crc32.c create_icmp_socket.c create_icmp6_socket.c \

View File

@ -1,3 +1,7 @@
# Copyright (C) 2006 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
# #
# fix ipkg bugs # fix ipkg bugs
# #