From 0c6fb98d013e4ffc664935a51adce94254d10f83 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 27 Nov 2009 19:33:20 +0100
Subject: update busybox and default config

---
 package/busybox/config/init/Config.in | 50 ++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 15 deletions(-)

(limited to 'package/busybox/config/init')

diff --git a/package/busybox/config/init/Config.in b/package/busybox/config/init/Config.in
index ddd49ea1b..bb2d0aa32 100644
--- a/package/busybox/config/init/Config.in
+++ b/package/busybox/config/init/Config.in
@@ -32,11 +32,12 @@ config BUSYBOX_FEATURE_KILL_DELAY
 	int "How long to wait between TERM and KILL (0 - send TERM only)" if FEATURE_KILL_REMOVED
 	range 0 1024
 	default 0
+	depends on BUSYBOX_FEATURE_KILL_REMOVED
 	help
 	  With nonzero setting, init sends TERM, forks, child waits N
 	  seconds, sends KILL and exits. Setting it too high is unwise
-	  (child will hang around for too long and can actually kill
-	  wrong process!)
+	  (child will hang around for too long and could actually kill
+	  the wrong process!)
 
 config BUSYBOX_FEATURE_INIT_SCTTY
 	bool "Run commands with leading dash with controlling tty"
@@ -55,12 +56,12 @@ config BUSYBOX_FEATURE_INIT_SCTTY
 
 config BUSYBOX_FEATURE_INIT_SYSLOG
 	bool "Enable init to write to syslog"
-	default y
+	default n
 	depends on BUSYBOX_INIT
 
 config BUSYBOX_FEATURE_EXTRA_QUIET
 	bool "Be _extra_ quiet on boot"
-	default n
+	default y
 	depends on BUSYBOX_INIT
 	help
 	  Prevent init from logging some messages to the console during boot.
@@ -75,17 +76,16 @@ config BUSYBOX_FEATURE_INIT_COREDUMPS
 	  core file sizes. If this option is disabled, processes
 	  will not generate any core files.
 
-# you should never need this, breaks allconfig images
-#config BUSYBOX_FEATURE_INITRD
-#	bool "Support running init from within an initrd (not initramfs)"
-#	default n
-#	depends on BUSYBOX_INIT
-#	help
-#	  Legacy support for running init under the old-style initrd. Allows
-#	  the name linuxrc to act as init, and it doesn't assume init is PID 1.
-#
-#	  This does not apply to initramfs, which runs /init as PID 1 and
-#	  requires no special support.
+config BUSYBOX_FEATURE_INITRD
+	bool "Support running init from within an initrd (not initramfs)"
+	default n
+	depends on BUSYBOX_INIT
+	help
+	  Legacy support for running init under the old-style initrd. Allows
+	  the name linuxrc to act as init, and it doesn't assume init is PID 1.
+
+	  This does not apply to initramfs, which runs /init as PID 1 and
+	  requires no special support.
 
 config BUSYBOX_HALT
 	bool "poweroff, halt, and reboot"
@@ -93,6 +93,26 @@ config BUSYBOX_HALT
 	help
 	  Stop all processes and either halt, reboot, or power off the system.
 
+config BUSYBOX_FEATURE_CALL_TELINIT
+	bool "Call telinit on shutdown and reboot"
+	default n
+	depends on BUSYBOX_HALT && !BUSYBOX_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_TELINIT_PATH
+	string "Path to telinit executable"
+	default "/sbin/telinit"
+	depends on BUSYBOX_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_MESG
 	bool "mesg"
 	default n
-- 
cgit v1.2.3