aboutsummaryrefslogtreecommitdiffstats
path: root/package/busybox/config/init
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2011-04-03 18:31:00 +0000
committerFlorian Fainelli <florian@openwrt.org>2011-04-03 18:31:00 +0000
commit03e30ae13f122c6606d8c63dbf0e49a5f4a8dc79 (patch)
tree138dd3337ab4da580067379a45074ea7e7cf7b11 /package/busybox/config/init
parent1bda5f253040898869baba09a04008ef51009cca (diff)
downloadupstream-03e30ae13f122c6606d8c63dbf0e49a5f4a8dc79.tar.gz
upstream-03e30ae13f122c6606d8c63dbf0e49a5f4a8dc79.tar.bz2
upstream-03e30ae13f122c6606d8c63dbf0e49a5f4a8dc79.zip
update busybox to 1.18.4, patch from Peter Wagner
SVN-Revision: 26455
Diffstat (limited to 'package/busybox/config/init')
-rw-r--r--package/busybox/config/init/Config.in57
1 files changed, 33 insertions, 24 deletions
diff --git a/package/busybox/config/init/Config.in b/package/busybox/config/init/Config.in
index bdf181c2f1..92aceed774 100644
--- a/package/busybox/config/init/Config.in
+++ b/package/busybox/config/init/Config.in
@@ -43,7 +43,31 @@ config BUSYBOX_CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE
help
Enable reading and parsing of $PWD/bootchartd.conf
and /etc/bootchartd.conf files.
+config BUSYBOX_CONFIG_HALT
+ bool "poweroff, halt, and reboot"
+ default y
+ help
+ Stop all processes and either halt, reboot, or power off the system.
+
+config BUSYBOX_CONFIG_FEATURE_CALL_TELINIT
+ bool "Call telinit on shutdown and reboot"
+ default n
+ depends on BUSYBOX_CONFIG_HALT && !BUSYBOX_CONFIG_INIT
+ help
+ Call an external program (normally telinit) to facilitate
+ a switch to a proper runlevel.
+ This option is only available if you selected halt and friends,
+ but did not select init.
+
+config BUSYBOX_CONFIG_TELINIT_PATH
+ string "Path to telinit executable"
+ default "/sbin/telinit"
+ depends on BUSYBOX_CONFIG_FEATURE_CALL_TELINIT
+ help
+ When busybox halt and friends have to call external telinit
+ to facilitate proper shutdown, this path is to be used when
+ locating telinit executable.
config BUSYBOX_CONFIG_INIT
bool "init"
default y
@@ -126,32 +150,17 @@ config BUSYBOX_CONFIG_FEATURE_INITRD
This does not apply to initramfs, which runs /init as PID 1 and
requires no special support.
-config BUSYBOX_CONFIG_HALT
- bool "poweroff, halt, and reboot"
- default y
- help
- Stop all processes and either halt, reboot, or power off the system.
-
-config BUSYBOX_CONFIG_FEATURE_CALL_TELINIT
- bool "Call telinit on shutdown and reboot"
- default n
- depends on BUSYBOX_CONFIG_HALT && !BUSYBOX_CONFIG_INIT
- help
- Call an external program (normally telinit) to facilitate
- a switch to a proper runlevel.
-
- This option is only available if you selected halt and friends,
- but did not select init.
-
-config BUSYBOX_CONFIG_TELINIT_PATH
- string "Path to telinit executable"
- default "/sbin/telinit"
- depends on BUSYBOX_CONFIG_FEATURE_CALL_TELINIT
+config BUSYBOX_CONFIG_INIT_TERMINAL_TYPE
+ string "Initial terminal type"
+ default "linux"
+ depends on BUSYBOX_CONFIG_INIT
help
- When busybox halt and friends have to call external telinit
- to facilitate proper shutdown, this path is to be used when
- locating telinit executable.
+ This is the initial value set by init for the TERM environment
+ variable. This variable is used by programs which make use of
+ extended terminal capabilities.
+ Note that on Linux, init attempts to detect serial terminal and
+ sets TERM to "vt102" if one is found.
config BUSYBOX_CONFIG_MESG
bool "mesg"
default y