X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=init%2FConfig.in;h=3987d8feeb6902d15fe9c74d6687e1ad0449e9d0;hb=a61cb92f2d1d9a7862813f37e3e3229e27ad21de;hp=c8c6a9cd62964eb7d149f441024e5a73cdd0e23b;hpb=e5642119ee566520a098027746808dd6b9226d99;p=oweals%2Fbusybox.git

diff --git a/init/Config.in b/init/Config.in
index c8c6a9cd6..3987d8fee 100644
--- a/init/Config.in
+++ b/init/Config.in
@@ -5,105 +5,85 @@
 
 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?"
-	default y
-	depends on CONFIG_INIT
+config FEATURE_INIT_SCTTY
+	bool "Support running commands with a controlling-tty"
+	default n
+	depends on INIT
 	help
-	  Allow init to be called from an initrd as linuxrc.
+	  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 FEATURE_INIT_SYSLOG
+	bool "Enable init to write to syslog"
+	default n
+	depends on INIT
 
-config CONFIG_FEATURE_INIT_COREDUMPS
-	bool "  Support dumping core for child processes (debugging only)?"
+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.
+
+config FEATURE_INIT_COREDUMPS
+	bool "Support dumping core for child processes (debugging only)"
+	default n
+	depends on INIT
 	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.
 
-config CONFIG_FEATURE_EXTRA_QUIET
-	bool "  Should init be _extra_ quiet on boot?"
-	default y
-	depends on CONFIG_INIT
-	help
-	  Prevent init from logging some messages to the console
-	  during boot.
 
-# Some apps that are meaningless without BusyBox running as init
-config CONFIG_HALT
-	bool "halt"
-	default y
-	depends on CONFIG_INIT
-	help
-	  'halt' tells the kernel to stop all processes and halt the system.
 
-config CONFIG_POWEROFF
-	bool "poweroff"
+config FEATURE_INITRD
+	bool "Support running init from within an initrd (not initramfs)"
 	default y
-	depends on CONFIG_INIT
+	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"
-	default y
-	depends on CONFIG_INIT
-	help
-	  Stop all processes and reboot the system.
-
-config CONFIG_MINIT
-	bool "minit"
-	default n
-	help
-	  Minimal init, based on minit v0.9.1.  This is a simple
-	  init replacement that handles starting/stopping services,
-	  and service dependencies.  See http://www.fefe.de/minit/
-	  for additional information.
-
-config CONFIG_PIDFILEHACK
-	bool "pidfilehack"
-	default y
-	depends on CONFIG_MINIT
-	help
-	  pidfilehack is used by minit to run servers.
-
-config CONFIG_MSVC
-	bool "msvc"
-	default y
-	depends on CONFIG_MINIT
-	help
-	  msvc is used to start and stop processes controlled by minit
+	  This does not apply to initramfs, which runs /init as PID 1 and
+	  requires no special support.
 
-# Should start-stop-daemon be moved under debianutils?
-config CONFIG_START_STOP_DAEMON
-	bool "start-stop-daemon"
+config HALT
+	bool "poweroff, halt, and reboot"
 	default y
 	help
-	  start-stop-daemon is used to control the creation and
-	  termination of system-level processes, usually the ones
-	  started during the startup of the system.
+	  Stop all processes and either halt, reboot, or power off the system.
 
-config CONFIG_MESG
+config MESG
 	bool "mesg"
 	default y
 	help
-	  Mesg  controls  the  access to your terminal by others.  It
-	  is typically used to allow or disallow other users to write
-	  to your  terminal
+	  Mesg controls access to your terminal by others.  It is typically
+	  used to allow or disallow other users to write to your terminal
 
 endmenu
-