- rerun gcse pass after reload, enable whole-program iff we are not building

[oweals/busybox.git] / init / Config.in

diff --git a/init/Config.in b/init/Config.in
index a3584aaf52d6862a965736b6e327af7173139bfe..11374713364d47eddc8a252ebde96c253d54ec25 100644 (file)
--- a/init/Config.in
+++ b/init/Config.in
@@ -12,39 +12,14 @@ config CONFIG_INIT
          init is the first program run when the system boots.
 
 config CONFIG_FEATURE_USE_INITTAB
-       bool "  Support reading an inittab file?"
+       bool "Support reading an inittab file"
        default y
        depends on CONFIG_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
-       help
-         Allow init to be called from an initrd as linuxrc.
-
-config CONFIG_FEATURE_INIT_COREDUMPS
-       bool "  Support dumping core for child processes (debugging only)?"
-       default n
-       depends on 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.
-
-config CONFIG_FEATURE_INIT_SWAPON
-       bool "  Should init run swapon if short on memory?"
-       default y
-       depends on CONFIG_INIT
-       help
-         If the system has less than one megabyte of total memory, init
-         will run '/sbin/swapon -a' to add swap memory.
-
 config CONFIG_FEATURE_INIT_SCTTY
-       bool "  Support running commands with a controlling-tty?"
+       bool "Support running commands with a controlling-tty"
        default n
        depends on CONFIG_INIT
        help
@@ -55,30 +30,40 @@ config CONFIG_FEATURE_INIT_SCTTY
          the console is only accessed during development or for maintenance.
 
 config CONFIG_FEATURE_EXTRA_QUIET
-       bool "  Should init be _extra_ quiet on boot?"
+       bool "Be _extra_ quiet on boot"
        default y
        depends on 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 CONFIG_HALT
-       bool "halt"
-       default y
+config CONFIG_FEATURE_INIT_COREDUMPS
+       bool "Support dumping core for child processes (debugging only)"
+       default n
+       depends on CONFIG_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 CONFIG_FEATURE_INITRD
+       bool "Support running init from within an initrd (not initramfs)"
        default y
+       depends on CONFIG_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.
+
+         This does not apply to initramfs, which runs /init as PID 1 and
+         requires no special support.
 
-config CONFIG_REBOOT
-       bool "reboot"
+config 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
        bool "mesg"
@@ -88,4 +73,3 @@ config CONFIG_MESG
          used to allow or disallow other users to write to your terminal
 
 endmenu
-