- apply hunk that fixes an issue with (wrong?) dependencies. Initial notes were:

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

diff --git a/networking/Config.in b/networking/Config.in
index 0251a14019261231a333e338b8202f84f273664f..f389fe9d40655b881d24a45afb019a37b32a88aa 100644 (file)
--- a/networking/Config.in
+++ b/networking/Config.in
@@ -212,7 +212,6 @@ config FEATURE_IFCONFIG_BROADCAST_PLUS
 config IFUPDOWN
        bool "ifupdown"
        default n
-       select RUN_PARTS
        help
          Activate or deactivate the specified interfaces.  This applet makes
          use of either "ifconfig" and "route" or the "ip" command to actually
@@ -223,8 +222,8 @@ config IFUPDOWN
          against my better judgement (since this will surely result in plenty
          of support questions on the mailing list), I do not force you to
          enable these additional options.  It is up to you to supply either
-         "ifconfig" and "route" or the "ip" command, either via busybox or via
-         standalone utilities.
+         "ifconfig", "route" and "run-parts" or the "ip" command, either
+         via busybox or via standalone utilities.
 
 config FEATURE_IFUPDOWN_IP
        bool "Use ip applet"
@@ -267,7 +266,7 @@ config FEATURE_IFUPDOWN_IPV4
        default y
        depends on IFUPDOWN
        help
-         If you want busybox to talk IPv4, leave this on.
+         If you want ifup/ifdown to talk IPv4, leave this on.
 
 config FEATURE_IFUPDOWN_IPV6
        bool "Enable support for IPv6"
@@ -276,13 +275,14 @@ config FEATURE_IFUPDOWN_IPV6
        help
          If you need support for IPv6, turn this option on.
 
-config FEATURE_IFUPDOWN_IPX
-       bool "Enable support for IPX"
-       default n
-       depends on IFUPDOWN
-       help
-         If this option is selected you can use busybox to work with IPX
-         networks.
+### UNUSED
+### config FEATURE_IFUPDOWN_IPX
+###    bool "Enable support for IPX"
+###    default n
+###    depends on IFUPDOWN
+###    help
+###      If this option is selected you can use busybox to work with IPX
+###      networks.
 
 config FEATURE_IFUPDOWN_MAPPING
        bool "Enable mapping support"
@@ -292,6 +292,16 @@ config FEATURE_IFUPDOWN_MAPPING
          This enables support for the "mapping" stanza, unless you have
          a weird network setup you don't need it.
 
+config FEATURE_IFUPDOWN_EXTERNAL_DHCP
+       bool "Enable support for external dhcp clients"
+       default n
+       depends on IFUPDOWN
+       help
+         This enables support for the external dhcp clients. Clients are
+         tried in the following order: dhcpcd, dhclient, pump and udhcpc.
+         Otherwise, if udhcpc applet is enabled, it is used.
+         Otherwise, ifup/ifdown will have no support for DHCP.
+
 config INETD
        bool "inetd"
        default n
@@ -394,6 +404,7 @@ config FEATURE_IP_SHORT_FORMS
          ip link   -> iplink
          ip route  -> iproute
          ip tunnel -> iptunnel
+         ip rule   -> iprule
 
          Say N unless you desparately need the short form of the ip
          object commands.
@@ -467,7 +478,7 @@ config NC
          connections.
 
 config NC_SERVER
-       bool "Netcat server options (-lp)"
+       bool "Netcat server options (-l)"
        default n
        depends on NC
        help
@@ -501,27 +512,19 @@ config PING
          ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
          elicit an ICMP ECHO_RESPONSE from a host or gateway.
 
-config FEATURE_FANCY_PING
-       bool "Enable fancy ping output"
-       default y
-       depends on PING
-       help
-         Make the output from the ping applet include statistics, and at the
-         same time provide full support for ICMP packets.
-
 config PING6
        bool "ping6"
        default n
-       depends on FEATURE_IPV6
+       depends on FEATURE_IPV6 && PING
        help
          This will give you a ping that can talk IPv6.
 
-config FEATURE_FANCY_PING6
-       bool "Enable fancy ping6 output"
+config FEATURE_FANCY_PING
+       bool "Enable fancy ping output"
        default y
-       depends on PING6
+       depends on PING
        help
-         Make the output from the ping6 applet include statistics, and at the
+         Make the output from the ping applet include statistics, and at the
          same time provide full support for ICMP packets.
 
 config ROUTE