Patch from Kent Robotti to being fdisk in sync with v2.12 final.

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

diff --git a/init/Config.in b/init/Config.in
index d56cd5540b26dc6a1c41c996c12eb0c1f9393ca2..eb42113863a77bcdecb79f5dee4bd414528fd0e7 100644 (file)
--- a/init/Config.in
+++ b/init/Config.in
@@ -27,7 +27,7 @@ config CONFIG_FEATURE_INITRD
 
 config CONFIG_FEATURE_INIT_COREDUMPS
        bool "  Support dumping core for child processes (debugging only)?"
-       default y
+       default n
        depends on CONFIG_INIT
        help
          If this option is enabled and the file /.init_enable_core
@@ -43,31 +43,28 @@ config CONFIG_FEATURE_EXTRA_QUIET
          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
-         Stop all processes.
+         Stop all processes and halt the system.
 
 config CONFIG_POWEROFF
        bool "poweroff"
        default y
-       depends on CONFIG_INIT
        help
          Stop all processes and (try to) power off the system.
 
 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
+       depends on ! CONFIG_INIT
        help
          Minimal init, based on minit v0.9.1.  This is a simple
          init replacement that handles starting/stopping services,
@@ -88,15 +85,6 @@ config CONFIG_MSVC
        help
          msvc is used to start and stop processes controlled by minit
 
-# Should start-stop-daemon be moved under debianutils?
-config CONFIG_START_STOP_DAEMON
-       bool "start-stop-daemon"
-       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.
-
 config CONFIG_MESG
        bool "mesg"
        default y