merge the control file and the .ipk file targets into one to prevent them from going...

[openwrt.git] / package / busybox / config / init / Config.in

diff --git a/package/busybox/config/init/Config.in b/package/busybox/config/init/Config.in
index 087d836..a84169d 100644 (file)
--- a/package/busybox/config/init/Config.in
+++ b/package/busybox/config/init/Config.in
@@ -8,65 +8,95 @@ menu "Init Utilities"
 config BUSYBOX_CONFIG_INIT
        bool "init"
        default y
 config BUSYBOX_CONFIG_INIT
        bool "init"
        default y

+       select BUSYBOX_CONFIG_FEATURE_SYSLOG

        help
          init is the first program run when the system boots.
 
 config BUSYBOX_CONFIG_FEATURE_USE_INITTAB
        help
          init is the first program run when the system boots.
 
 config BUSYBOX_CONFIG_FEATURE_USE_INITTAB

-       bool "  Support reading an inittab file?"
+       bool "Support reading an inittab file"

        default y
        depends on BUSYBOX_CONFIG_INIT
        help
          Allow init to read an inittab file when the system boot.
 
        default y
        depends on BUSYBOX_CONFIG_INIT
        help
          Allow init to read an inittab file when the system boot.
 

-config BUSYBOX_CONFIG_FEATURE_INITRD
-       bool "  Support running init from within an initrd?"
+config BUSYBOX_CONFIG_FEATURE_KILL_REMOVED
+       bool "Support killing processes that have been removed from inittab"

        default n
        default n

-       depends on BUSYBOX_CONFIG_INIT
+       depends on BUSYBOX_CONFIG_FEATURE_USE_INITTAB

        help
        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 BUSYBOX_CONFIG_FEATURE_INIT_COREDUMPS
-       bool "  Support dumping core for child processes (debugging only)?"
+config BUSYBOX_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
+         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 BUSYBOX_CONFIG_FEATURE_INIT_SCTTY
+       bool "Run commands with leading dash with controlling tty"

        default n
        depends on BUSYBOX_CONFIG_INIT
        help
        default n
        depends on BUSYBOX_CONFIG_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.
+         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 BUSYBOX_CONFIG_FEATURE_INIT_SYSLOG
+       bool "Enable init to write to syslog"
+       default y
+       depends on BUSYBOX_CONFIG_INIT

 
 config BUSYBOX_CONFIG_FEATURE_EXTRA_QUIET
 
 config BUSYBOX_CONFIG_FEATURE_EXTRA_QUIET

-       bool "  Should init be _extra_ quiet on boot?"
+       bool "Be _extra_ quiet on boot"

        default n
        depends on BUSYBOX_CONFIG_INIT
        help
        default n
        depends on BUSYBOX_CONFIG_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 BUSYBOX_CONFIG_HALT
-       bool "halt"
+config BUSYBOX_CONFIG_FEATURE_INIT_COREDUMPS
+       bool "Support dumping core for child processes (debugging only)"

        default n
        default n

+       depends on BUSYBOX_CONFIG_INIT

        help
        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 BUSYBOX_CONFIG_POWEROFF
-       bool "poweroff"
+config BUSYBOX_CONFIG_FEATURE_INITRD
+       bool "Support running init from within an initrd (not initramfs)"

        default n
        default n

+       depends on BUSYBOX_CONFIG_INIT

        help
        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.
+
+         This does not apply to initramfs, which runs /init as PID 1 and
+         requires no special support.

 
 

-config BUSYBOX_CONFIG_REBOOT
-       bool "reboot"
+config BUSYBOX_CONFIG_HALT
+       bool "poweroff, halt, and reboot"

        default y
        help
        default y
        help

-         Stop all processes and reboot the system.
+         Stop all processes and either halt, reboot, or power off the system.

 
 config BUSYBOX_CONFIG_MESG
        bool "mesg"
        default y
        help
 
 config BUSYBOX_CONFIG_MESG
        bool "mesg"
        default y
        help

-         Mesg controls access to your terminal by others.  It is typically
+         Mesg controls access to your terminal by others. It is typically

          used to allow or disallow other users to write to your terminal
 
 endmenu
          used to allow or disallow other users to write to your terminal
 
 endmenu

-