From 7d5d7449e0b146f62a5271032bd9841ed77caac8 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sun, 3 Apr 2011 18:31:00 +0000 Subject: [package] update busybox to 1.18.4, patch from Peter Wagner git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26455 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/busybox/config/init/Config.in | 57 ++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 24 deletions(-) (limited to 'package/busybox/config/init') 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 -- cgit v1.2.3