X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=init%2FConfig.in;h=25f439003c366cca4bbb23858c92316eaa6cfee9;hb=fc9fc1f9292861cd1621d884338a766289acdf4a;hp=91d990c381776fef1267defd7571474cdaca5274;hpb=c3386a43048907fb07fb28f2723c1efbacf4bd79;p=oweals%2Fbusybox.git

diff --git a/init/Config.in b/init/Config.in
index 91d990c38..25f439003 100644
--- a/init/Config.in
+++ b/init/Config.in
@@ -5,74 +5,104 @@
 
 menu "Init Utilities"
 
-config CONFIG_INIT
+config INIT
 	bool "init"
 	default n
+	select FEATURE_SYSLOG
 	help
 	  init is the first program run when the system boots.
 
-config CONFIG_FEATURE_USE_INITTAB
-	bool "  Support reading an inittab file?"
+config DEBUG_INIT
+	bool "Debugging aid"
+	default n
+	depends on INIT
+	help
+	  Turn this on to disable all the dangerous
+	  rebooting stuff when debugging.
+
+config FEATURE_USE_INITTAB
+	bool "Support reading an inittab file"
 	default y
-	depends on CONFIG_INIT
+	depends on INIT
 	help
 	  Allow init to read an inittab file when the system boot.
 
-config CONFIG_FEATURE_INITRD
-	bool "  Support running init from within an initrd?"
+config FEATURE_KILL_REMOVED
+	bool "Support killing processes that have been removed from inittab"
 	default y
-	depends on CONFIG_INIT
+	depends on FEATURE_USE_INITTAB
 	help
-	  Allow init to be called from an initrd as linuxrc.
+	  When respawn entries are removed from inittab and a SIGHUP is
+	  sent to init, this feature will kill the processes that have
+	  been removed.
 
-config CONFIG_FEATURE_INIT_COREDUMPS
-	bool "  Support dumping core for child processes (debugging only)?"
-	default n
-	depends on CONFIG_INIT
+config 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
 	help
-	  If this option is enabled and the file /.init_enable_core
-	  exists, then init will call setrlimit() to allow unlimited
-	  core file sizes.  If this option is disabled, processes
-	  will not generate any core files.
+	  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!)
 
-config CONFIG_FEATURE_INIT_SCTTY
-	bool "  Support running commands with a controlling-tty?"
+config FEATURE_INIT_SCTTY
+	bool "Run commands with leading dash with controlling tty"
 	default n
-	depends on CONFIG_INIT
+	depends on INIT
 	help
-	  If this option is enabled a command starting with hyphen (-)
-	  is run in its own session (setsid(2)) and possibly with a
-	  controlling tty (TIOCSCTTY).  This is not the traditional init
-	  behavour, but is often what you want in an embedded system where
-	  the console is only accessed during development or for maintenance.
-
-config CONFIG_FEATURE_EXTRA_QUIET
-	bool "  Should init be _extra_ quiet on boot?"
+	  If this option is enabled, init will try to give a controlling
+	  tty to any command which has leading hyphen (often it's "-/bin/sh").
+	  More precisely, init will do "ioctl(STDIN_FILENO, TIOCSCTTY, 0)".
+	  If device attached to STDIN_FILENO can be a ctty but is not yet
+	  a ctty for other session, it will become this process' ctty.
+	  This is not the traditional init behavour, but is often what you want
+	  in an embedded system where the console is only accessed during
+	  development or for maintenance.
+	  NB: using cttyhack applet may work better.
+
+config FEATURE_INIT_SYSLOG
+	bool "Enable init to write to syslog"
+	default n
+	depends on INIT
+
+config FEATURE_EXTRA_QUIET
+	bool "Be _extra_ quiet on boot"
 	default y
-	depends on CONFIG_INIT
+	depends on INIT
 	help
-	  Prevent init from logging some messages to the console
-	  during boot.
+	  Prevent init from logging some messages to the console during boot.
 
-config CONFIG_HALT
-	bool "halt"
-	default y
+config FEATURE_INIT_COREDUMPS
+	bool "Support dumping core for child processes (debugging only)"
+	default n
+	depends on INIT
 	help
-	  Stop all processes and halt the system.
+	  If this option is enabled and the file /.init_enable_core
+	  exists, then init will call setrlimit() to allow unlimited
+	  core file sizes.  If this option is disabled, processes
+	  will not generate any core files.
+
+
 
-config CONFIG_POWEROFF
-	bool "poweroff"
+config FEATURE_INITRD
+	bool "Support running init from within an initrd (not initramfs)"
 	default y
+	depends on INIT
 	help
-	  Stop all processes and (try to) power off the system.
+	  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.
 
-config CONFIG_REBOOT
-	bool "reboot"
+	  This does not apply to initramfs, which runs /init as PID 1 and
+	  requires no special support.
+
+config HALT
+	bool "poweroff, halt, and reboot"
 	default y
 	help
-	  Stop all processes and reboot the system.
+	  Stop all processes and either halt, reboot, or power off the system.
 
-config CONFIG_MESG
+config MESG
 	bool "mesg"
 	default y
 	help
@@ -80,4 +110,3 @@ config CONFIG_MESG
 	  used to allow or disallow other users to write to your terminal
 
 endmenu
-