From 088d86511f9e407a27a62e16af60ced1fb05944f Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Wed, 20 Aug 2008 14:00:34 +0000 Subject: upgrade busybox to v1.11.1 and add current upstream fixes git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12348 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/busybox/config/miscutils/Config.in | 153 ++++++++++++++++++++++++++--- 1 file changed, 139 insertions(+), 14 deletions(-) (limited to 'package/busybox/config/miscutils/Config.in') diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in index d038f118bd..236d5d678e 100644 --- a/package/busybox/config/miscutils/Config.in +++ b/package/busybox/config/miscutils/Config.in @@ -19,6 +19,73 @@ config BUSYBOX_CONFIG_BBCONFIG The bbconfig applet will print the config file with which busybox was built. +config BUSYBOX_CONFIG_CHAT + bool "chat" + default n + help + Simple chat utility. + +config BUSYBOX_CONFIG_FEATURE_CHAT_NOFAIL + bool "Enable NOFAIL expect strings" + depends on BUSYBOX_CONFIG_CHAT + default n + help + When enabled expect strings which are started with a dash trigger + no-fail mode. That is when expectation is not met within timeout + the script is not terminated but sends next SEND string and waits + for next EXPECT string. This allows to compose far more flexible + scripts. + +config BUSYBOX_CONFIG_FEATURE_CHAT_TTY_HIFI + bool "Force STDIN to be a TTY" + depends on BUSYBOX_CONFIG_CHAT + default n + help + Original chat always treats STDIN as a TTY device and sets for it + so-called raw mode. This option turns on such behaviour. + +config BUSYBOX_CONFIG_FEATURE_CHAT_IMPLICIT_CR + bool "Enable implicit Carriage Return" + depends on BUSYBOX_CONFIG_CHAT + default n + help + When enabled make chat to terminate all SEND strings with a "\r" + unless "\c" is met anywhere in the string. + +config BUSYBOX_CONFIG_FEATURE_CHAT_SWALLOW_OPTS + bool "Swallow options" + depends on BUSYBOX_CONFIG_CHAT + default n + help + Busybox chat require no options. To make it not fail when used + in place of original chat (which has a bunch of options) turn + this on. + +config BUSYBOX_CONFIG_FEATURE_CHAT_SEND_ESCAPES + bool "Support weird SEND escapes" + depends on BUSYBOX_CONFIG_CHAT + default n + help + Original chat uses some escape sequences in SEND arguments which + are not sent to device but rather performs special actions. + E.g. "\K" means to send a break sequence to device. + "\d" delays execution for a second, "\p" -- for a 1/100 of second. + Before turning this option on think twice: do you really need them? + +config BUSYBOX_CONFIG_FEATURE_CHAT_VAR_ABORT_LEN + bool "Support variable-length ABORT conditions" + depends on BUSYBOX_CONFIG_CHAT + default n + help + Original chat uses fixed 50-bytes length ABORT conditions. Say N here. + +config BUSYBOX_CONFIG_FEATURE_CHAT_CLR_ABORT + bool "Support revoking of ABORT conditions" + depends on BUSYBOX_CONFIG_CHAT + default n + help + Support CLR_ABORT directive. + config BUSYBOX_CONFIG_CHRT bool "chrt" default n @@ -39,15 +106,13 @@ config BUSYBOX_CONFIG_CROND $ cat /var/spool/cron/crontabs/root # Run daily cron jobs at 4:40 every day: 40 4 * * * /etc/cron/daily > /dev/null 2>&1 - Note that Busybox binary must be setuid root for this applet to - work properly. config BUSYBOX_CONFIG_DEBUG_CROND_OPTION - bool "Support debug option -d" + bool "Support option -d to redirect output to stderr" depends on BUSYBOX_CONFIG_CROND default n help - Support option -d to enter debug mode. + -d sets loglevel to 0 (most verbose) and directs all output to stderr. config BUSYBOX_CONFIG_FEATURE_CROND_CALL_SENDMAIL bool "Using /usr/sbin/sendmail?" @@ -63,6 +128,8 @@ config BUSYBOX_CONFIG_CRONTAB help Crontab manipulates the crontab for a particular user. Only the superuser may specify a different user and/or crontab directory. + Note that Busybox binary must be setuid root for this applet to + work properly. config BUSYBOX_CONFIG_DC bool "dc" @@ -111,7 +178,7 @@ config BUSYBOX_CONFIG_DEVFSD_VERBOSE Increases logging to stderr or syslog. config BUSYBOX_CONFIG_FEATURE_DEVFS - bool " Use devfs names for all devices (obsolete)" + bool "Use devfs names for all devices (obsolete)" default n help This is obsolete and will be going away at the end of 2008.. @@ -126,6 +193,41 @@ config BUSYBOX_CONFIG_EJECT help Used to eject cdroms. (defaults to /dev/cdrom) +config BUSYBOX_CONFIG_FEATURE_EJECT_SCSI + bool "SCSI support" + default n + depends on BUSYBOX_CONFIG_EJECT + help + Add the -s option to eject, this allows to eject SCSI-Devices and + usb-storage devices. + +config BUSYBOX_CONFIG_FBSPLASH + bool "fbsplash" + default n + help + Shows splash image and progress bar on framebuffer device. + Can be used during boot phase of an embedded device. ~2kb. + Usage: + - use kernel option 'vga=xxx' or otherwise enable fb device. + - put somewhere fbsplash.cfg file and an image in .ppm format. + - $ setsid fbsplash [params] & + -c: hide cursor + -d /dev/fbN: framebuffer device (if not /dev/fb0) + -s path_to_image_file (can be "-" for stdin) + -i path_to_cfg_file (can be "-" for stdin) + -f path_to_fifo (can be "-" for stdin) + - if you want to run it only in presence of kernel parameter: + grep -q "fbsplash=on" = 2.6.13 + config BUSYBOX_CONFIG_LAST bool "last" default n @@ -133,6 +235,24 @@ config BUSYBOX_CONFIG_LAST help 'last' displays a list of the last users that logged into the system. +choice + prompt "Choose last implementation" + depends on BUSYBOX_CONFIG_LAST + default BUSYBOX_CONFIG_FEATURE_LAST_SMALL + +config BUSYBOX_CONFIG_FEATURE_LAST_SMALL + bool "small" + help + This is a small version of last with just the basic set of + features. + +config BUSYBOX_CONFIG_FEATURE_LAST_FANCY + bool "huge" + help + 'last' displays detailed information about the last users that + logged into the system (mimics sysvinit last). +900 bytes. +endchoice + config BUSYBOX_CONFIG_LESS bool "less" default y @@ -282,6 +402,12 @@ config BUSYBOX_CONFIG_FEATURE_MAKEDEVS_TABLE endchoice +config BUSYBOX_CONFIG_MAN + bool "man" + default n + help + Format and display manual pages. + config BUSYBOX_CONFIG_MICROCOM bool "microcom" default n @@ -320,7 +446,7 @@ config BUSYBOX_CONFIG_READAHEAD This applet just calls the readahead(2) system call on each file. It is mainly useful in system startup scripts to preload files or executables before they are used. When used at the right time - (in particular when a CPU boundprocess is running) it can + (in particular when a CPU bound process is running) it can significantly speed up system startup. As readahead(2) blocks until each file has been read, it is best to @@ -341,6 +467,12 @@ config BUSYBOX_CONFIG_RX help Receive files using the Xmodem protocol. +config BUSYBOX_CONFIG_SETSID + bool "setsid" + default n + help + setsid runs a program in a new session + config BUSYBOX_CONFIG_STRINGS bool "strings" default y @@ -348,12 +480,6 @@ config BUSYBOX_CONFIG_STRINGS strings prints the printable character sequences for each file specified. -config BUSYBOX_CONFIG_SETSID - bool "setsid" - default n - help - setsid runs a program in a new session - config BUSYBOX_CONFIG_TASKSET bool "taskset" default n @@ -362,7 +488,7 @@ config BUSYBOX_CONFIG_TASKSET This requires sched_{g,s}etaffinity support in your libc. config BUSYBOX_CONFIG_FEATURE_TASKSET_FANCY - bool "fancy output" + bool "Fancy output" default n depends on BUSYBOX_CONFIG_TASKSET help @@ -398,4 +524,3 @@ config BUSYBOX_CONFIG_WATCHDOG hung, and will cause the hardware to reboot. endmenu - -- cgit v1.2.3