summaryrefslogtreecommitdiff
path: root/package/busybox
diff options
context:
space:
mode:
Diffstat (limited to 'package/busybox')
-rw-r--r--package/busybox/config/init/Config.in3
-rw-r--r--package/busybox/config/shell/Config.in2
2 files changed, 4 insertions, 1 deletions
diff --git a/package/busybox/config/init/Config.in b/package/busybox/config/init/Config.in
index d8b4a449e..58ab4bca4 100644
--- a/package/busybox/config/init/Config.in
+++ b/package/busybox/config/init/Config.in
@@ -44,6 +44,7 @@ config BUSYBOX_FEATURE_BOOTCHARTD_CONFIG_FILE
help
Enable reading and parsing of $PWD/bootchartd.conf
and /etc/bootchartd.conf files.
+
config BUSYBOX_HALT
bool "poweroff, halt, and reboot"
default y
@@ -69,9 +70,11 @@ config BUSYBOX_TELINIT_PATH
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_INIT
bool "init"
default y
+ depends on !ADK_TARGET_UCLINUX
select BUSYBOX_FEATURE_SYSLOG
help
init is the first program run when the system boots.
diff --git a/package/busybox/config/shell/Config.in b/package/busybox/config/shell/Config.in
index b1b8ad4b2..dd396b015 100644
--- a/package/busybox/config/shell/Config.in
+++ b/package/busybox/config/shell/Config.in
@@ -299,7 +299,7 @@ config BUSYBOX_MSH
choice
prompt "Choose which shell is aliased to 'sh' name"
- default FEATURE_SH_IS_ASH
+ default FEATURE_SH_IS_NONE
help
Choose which shell you want to be executed by 'sh' alias.
The ash shell is the most bash compatible and full featured one.