[package] dnsmasq: remove redundant code introduced with r20074

[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 07f6fae..9498895 100644 (file)
--- a/package/busybox/config/init/Config.in
+++ b/package/busybox/config/init/Config.in
@@ -12,14 +12,6 @@ config BUSYBOX_CONFIG_INIT
        help
          init is the first program run when the system boots.
 
        help
          init is the first program run when the system boots.
 

-config BUSYBOX_CONFIG_DEBUG_INIT
-       bool "Debugging aid"
-       default n
-       depends on BUSYBOX_CONFIG_INIT
-       help
-         Turn this on to disable all the dangerous
-         rebooting stuff when debugging.
-

 config BUSYBOX_CONFIG_FEATURE_USE_INITTAB
        bool "Support reading an inittab file"
        default y
 config BUSYBOX_CONFIG_FEATURE_USE_INITTAB
        bool "Support reading an inittab file"
        default y


@@ -40,11 +32,12 @@ 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
        int "How long to wait between TERM and KILL (0 - send TERM only)" if FEATURE_KILL_REMOVED
        range 0 1024
        default 0

+       depends on BUSYBOX_CONFIG_FEATURE_KILL_REMOVED

        help
          With nonzero setting, init sends TERM, forks, child waits N
          seconds, sends KILL and exits. Setting it too high is unwise
        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!)
+         (child will hang around for too long and could actually kill
+         the wrong process!)

 
 config BUSYBOX_CONFIG_FEATURE_INIT_SCTTY
        bool "Run commands with leading dash with controlling tty"
 
 config BUSYBOX_CONFIG_FEATURE_INIT_SCTTY
        bool "Run commands with leading dash with controlling tty"


@@ -83,8 +76,6 @@ config BUSYBOX_CONFIG_FEATURE_INIT_COREDUMPS
          core file sizes. If this option is disabled, processes
          will not generate any core files.
 
          core file sizes. If this option is disabled, processes
          will not generate any core files.
 

-
-

 config BUSYBOX_CONFIG_FEATURE_INITRD
        bool "Support running init from within an initrd (not initramfs)"
        default n
 config BUSYBOX_CONFIG_FEATURE_INITRD
        bool "Support running init from within an initrd (not initramfs)"
        default n


@@ -102,6 +93,26 @@ config BUSYBOX_CONFIG_HALT
        help
          Stop all processes and either halt, reboot, or power off the system.
 
        help
          Stop all processes and either halt, reboot, or power off the system.
 

+config BUSYBOX_CONFIG_FEATURE_CALL_TELINIT
+       bool "Call telinit on shutdown and reboot"
+       default n
+       depends on BUSYBOX_CONFIG_HALT && !BUSYBOX_CONFIG_INIT
+       help
+         Call an external program (normally telinit) to facilitate
+         a switch to a proper runlevel.
+
+         This option is only available if you selected halt and friends,
+         but did not select init.
+
+config BUSYBOX_CONFIG_TELINIT_PATH
+       string "Path to telinit executable"
+       default "/sbin/telinit"
+       depends on BUSYBOX_CONFIG_FEATURE_CALL_TELINIT
+       help
+         When busybox halt and friends have to call external telinit
+         to facilitate proper shutdown, this path is to be used when
+         locating telinit executable.
+

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