diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-04-18 12:11:37 +0400 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-04-18 12:11:37 +0400 |
commit | 29495779817190c5ee7281b611788c25556d8d41 (patch) | |
tree | 51f5a7ae8255506ea0a0585d0d2abc57d07ee40f /networking/Config.in | |
parent | a2e98043d5d2e9875cb7b546ec0182893b063f65 (diff) |
- simplify config options of the ip applet.
Diffstat (limited to 'networking/Config.in')
-rw-r--r-- | networking/Config.in | 134 |
1 files changed, 58 insertions, 76 deletions
diff --git a/networking/Config.in b/networking/Config.in index 03b8d7bde..e44005394 100644 --- a/networking/Config.in +++ b/networking/Config.in @@ -337,99 +337,81 @@ config CONFIG_IP utility. You generally don't need "ip" to use busybox with TCP/IP. -if CONFIG_IP && CONFIG_IPADDR - config CONFIG_FEATURE_IP_ADDRESS - default y - comment " address (forced enabled for ipaddr)" -endif -if ! (CONFIG_IP && CONFIG_IPADDR) - config CONFIG_FEATURE_IP_ADDRESS - bool " address" - default y - depends on CONFIG_IP - help - Address manipulation support for the "ip" applet. -endif - -if CONFIG_IP && CONFIG_IPLINK - config CONFIG_FEATURE_IP_LINK - default y - comment " link (forced enabled for iplink)" -endif -if !(CONFIG_IP && CONFIG_IPLINK) - config CONFIG_FEATURE_IP_LINK - bool " link" - default y - depends on CONFIG_IP - help - Configure network devices with "ip". -endif - -if CONFIG_IP && CONFIG_IPROUTE - config CONFIG_FEATURE_IP_ROUTE - default y - comment " route (forced enabled for iproute)" -endif -if !(CONFIG_IP && CONFIG_IPROUTE) - config CONFIG_FEATURE_IP_ROUTE - bool " route" - default y - depends on CONFIG_IP - help - Add support for routing table management to "ip". -endif - -if CONFIG_IP && CONFIG_IPTUNNEL - config CONFIG_FEATURE_IP_TUNNEL - default y - comment " tunnel (forced enabled for iptunnel)" -endif -if !(CONFIG_IP && CONFIG_IPTUNNEL) - config CONFIG_FEATURE_IP_TUNNEL - bool " tunnel" - default n - depends on CONFIG_IP - help - Add support for tunneling commands to "ip". -endif +config CONFIG_FEATURE_IP_ADDRESS + bool "ip address" + default y + depends on CONFIG_IP + help + Address manipulation support for the "ip" applet. -config CONFIG_IPCALC - bool "ipcalc" - default n +config CONFIG_FEATURE_IP_LINK + bool "ip link" + default y + depends on CONFIG_IP help - ipcalc takes an IP address and netmask and calculates the - resulting broadcast, network, and host range. + Configure network devices with "ip". -config CONFIG_FEATURE_IPCALC_FANCY - bool " Fancy IPCALC, more options, adds 1 kbyte" +config CONFIG_FEATURE_IP_ROUTE + bool "ip route" default y - depends on CONFIG_IPCALC + depends on CONFIG_IP help - Adds the options hostname, prefix and silent to the output of "ipcalc". + Add support for routing table management to "ip". -config CONFIG_IPADDR - bool "ipaddr" +config CONFIG_FEATURE_IP_TUNNEL + bool "ip tunnel" default n + depends on CONFIG_IP help - Equivalent to selecting address support to "ip", above. + Add support for tunneling commands to "ip". -config CONFIG_IPLINK - bool "iplink" +config CONFIG_FEATURE_IP_SHORT_FORMS + bool "Support short forms of ip commands." default n + depends on CONFIG_IP help - Equivalent to selecting link support to "ip", above. + Also support short-form of ip <OBJECT> commands: + ip addr -> ipaddr + ip link -> iplink + ip route -> iproute + ip tunnel -> iptunnel + + Say N unless you desparately need the short form of the ip + object commands. + +config CONFIG_IPADDR + bool + default y + depends on CONFIG_FEATURE_IP_SHORT_FORMS && CONFIG_FEATURE_IP_ADDRESS + +config CONFIG_IPLINK + bool + default y + depends on CONFIG_FEATURE_IP_SHORT_FORMS && CONFIG_FEATURE_IP_LINK config CONFIG_IPROUTE - bool "iproute" - default n - help - Equivalent to selecting route support to "ip", above. + bool + default y + depends on CONFIG_FEATURE_IP_SHORT_FORMS && CONFIG_FEATURE_IP_ROUTE config CONFIG_IPTUNNEL - bool "iptunnel" + bool + default y + depends on CONFIG_FEATURE_IP_SHORT_FORMS && CONFIG_FEATURE_IP_TUNNEL + +config CONFIG_IPCALC + bool "ipcalc" default n help - Equivalent to selecting tunnel support to "ip", above. + ipcalc takes an IP address and netmask and calculates the + resulting broadcast, network, and host range. + +config CONFIG_FEATURE_IPCALC_FANCY + bool " Fancy IPCALC, more options, adds 1 kbyte" + default y + depends on CONFIG_IPCALC + help + Adds the options hostname, prefix and silent to the output of "ipcalc". config CONFIG_NAMEIF bool "nameif" |