aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2016-12-23 15:18:31 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2016-12-23 15:20:16 +0100
commit100aea84869a9ee0f71f7b5cc7ebee9fb5c4b44a (patch)
treef0e4e3cf813cae58c10efcaa8477b965dbcff833
parenta1cd0d9849946e0627484ec6b6435837c853a113 (diff)
downloadbusybox-100aea84869a9ee0f71f7b5cc7ebee9fb5c4b44a.tar.gz
Remove FEATURE_IFUPDOWN_IP_BUILTIN and FEATURE_IFUPDOWN_IFCONFIG_BUILTIN
They merely enable ip or ifconfig/route. There is already a way to do this on the same menuconfig page. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--networking/ifupdown.c36
1 files changed, 7 insertions, 29 deletions
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 7ac517afd..1806a6ccc 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -51,41 +51,19 @@
//config: This config option defines location of ifstate.
//config:
//config:config FEATURE_IFUPDOWN_IP
-//config: bool "Use ip applet"
+//config: bool "Use ip tool (else ifconfig/route is used)"
//config: default y
//config: depends on IFUP || IFDOWN
//config: help
//config: Use the iproute "ip" command to implement "ifup" and "ifdown", rather
-//config: than the default of using the older 'ifconfig' and 'route' utilities.
+//config: than the default of using the older "ifconfig" and "route" utilities.
//config:
-//config:config FEATURE_IFUPDOWN_IP_BUILTIN
-//config: bool "Use busybox ip applet"
-//config: default y
-//config: depends on FEATURE_IFUPDOWN_IP
-//config: select PLATFORM_LINUX
-//config: select IP
-//config: select FEATURE_IP_ADDRESS
-//config: select FEATURE_IP_LINK
-//config: select FEATURE_IP_ROUTE
-//config: help
-//config: Use the busybox iproute "ip" applet to implement "ifupdown".
-//config:
-//config: If left disabled, you must install the full-blown iproute2
-//config: utility or the "ifup" and "ifdown" applets will not work.
-//config:
-//config:config FEATURE_IFUPDOWN_IFCONFIG_BUILTIN
-//config: bool "Use busybox ifconfig and route applets"
-//config: default n
-//config: depends on (IFUP || IFDOWN) && !FEATURE_IFUPDOWN_IP
-//config: select IFCONFIG
-//config: select ROUTE
-//config: help
-//config: Use the busybox iproute "ifconfig" and "route" applets to
-//config: implement the "ifup" and "ifdown" utilities.
+//config: If Y: you must install either the full-blown iproute2 package
+//config: or enable "ip" applet in Busybox, or the "ifup" and "ifdown" applets
+//config: will not work.
//config:
-//config: If left disabled, you must install the full-blown ifconfig
-//config: and route utilities, or the "ifup" and "ifdown" applets will not
-//config: work.
+//config: If N: you must install either the full-blown ifconfig and route
+//config: utilities, or enable these applets in Busybox.
//config:
//config:config FEATURE_IFUPDOWN_IPV4
//config: bool "Support for IPv4"