Re-add initrd support, unify halt/reboot/poweroff, add -n and -f options.

1 files changed, 26 insertions, 29 deletions

diff --git a/init/Config.in b/init/Config.in
index ba157081c..d5af54e47 100644
--- a/init/Config.in
+++ b/init/Config.in
@@ -12,21 +12,32 @@ 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?"
+config CONFIG_FEATURE_INIT_SCTTY
+        bool "  Support running commands with a controlling-tty"
+        default n
+        depends on CONFIG_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 "  Be _extra_ quiet on boot"
         default y
         depends on CONFIG_INIT
         help
-          Allow init to be called from an initrd as linuxrc.
+          Prevent init from logging some messages to the console during boot.
 
 config CONFIG_FEATURE_INIT_COREDUMPS
-        bool "  Support dumping core for child processes (debugging only)?"
+        bool "  Support dumping core for child processes (debugging only)"
         default n
         depends on CONFIG_INIT
         help
@@ -35,30 +46,24 @@ config CONFIG_FEATURE_INIT_COREDUMPS
           core file sizes.  If this option is disabled, processes
           will not generate any core files.
 
-config CONFIG_FEATURE_INIT_SCTTY
-        bool "  Support running commands with a controlling-tty?"
-        default n
-        depends on CONFIG_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?"
+
+config CONFIG_FEATURE_INITRD
+        bool "  Support running init from within an initrd (not initramfs)"
         default y
         depends on CONFIG_INIT
         help
-          Prevent init from logging some messages to the console
-          during boot.
+          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_HALT
-        bool "halt"
+        bool "poweroff, halt, and reboot"
         default y
         help
-          Stop all processes and halt the system.
+          Stop all processes and either halt, reboot, or power off the system.
 
 config CONFIG_MESG
         bool "mesg"
@@ -67,17 +72,9 @@ config CONFIG_MESG
           Mesg controls access to your terminal by others.  It is typically
           used to allow or disallow other users to write to your terminal
 
-config CONFIG_POWEROFF
-        bool "poweroff"
         default y
         help
           Stop all processes and (try to) power off the system.
 
-config CONFIG_REBOOT
-        bool "reboot"
-        default y
-        help
-          Stop all processes and reboot the system.
-
 endmenu