diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-12-23 15:18:31 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-01 13:01:04 +0100 |
| commit | 890b1feaa011261748e085037da4ef4720ef3de2 (patch) | |
| tree | 42362e4d33944f099cd4cf2c082274c82b477efd | |
| parent | d28cd9900a58a902b1bf53404a250dfb345b2e96 (diff) | |
| download | busybox-w32-890b1feaa011261748e085037da4ef4720ef3de2.tar.gz busybox-w32-890b1feaa011261748e085037da4ef4720ef3de2.tar.bz2 busybox-w32-890b1feaa011261748e085037da4ef4720ef3de2.zip | |
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.c | 36 |
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 @@ | |||
| 51 | //config: This config option defines location of ifstate. | 51 | //config: This config option defines location of ifstate. |
| 52 | //config: | 52 | //config: |
| 53 | //config:config FEATURE_IFUPDOWN_IP | 53 | //config:config FEATURE_IFUPDOWN_IP |
| 54 | //config: bool "Use ip applet" | 54 | //config: bool "Use ip tool (else ifconfig/route is used)" |
| 55 | //config: default y | 55 | //config: default y |
| 56 | //config: depends on IFUP || IFDOWN | 56 | //config: depends on IFUP || IFDOWN |
| 57 | //config: help | 57 | //config: help |
| 58 | //config: Use the iproute "ip" command to implement "ifup" and "ifdown", rather | 58 | //config: Use the iproute "ip" command to implement "ifup" and "ifdown", rather |
| 59 | //config: than the default of using the older 'ifconfig' and 'route' utilities. | 59 | //config: than the default of using the older "ifconfig" and "route" utilities. |
| 60 | //config: | 60 | //config: |
| 61 | //config:config FEATURE_IFUPDOWN_IP_BUILTIN | 61 | //config: If Y: you must install either the full-blown iproute2 package |
| 62 | //config: bool "Use busybox ip applet" | 62 | //config: or enable "ip" applet in Busybox, or the "ifup" and "ifdown" applets |
| 63 | //config: default y | 63 | //config: will not work. |
| 64 | //config: depends on FEATURE_IFUPDOWN_IP | ||
| 65 | //config: select PLATFORM_LINUX | ||
| 66 | //config: select IP | ||
| 67 | //config: select FEATURE_IP_ADDRESS | ||
| 68 | //config: select FEATURE_IP_LINK | ||
| 69 | //config: select FEATURE_IP_ROUTE | ||
| 70 | //config: help | ||
| 71 | //config: Use the busybox iproute "ip" applet to implement "ifupdown". | ||
| 72 | //config: | ||
| 73 | //config: If left disabled, you must install the full-blown iproute2 | ||
| 74 | //config: utility or the "ifup" and "ifdown" applets will not work. | ||
| 75 | //config: | ||
| 76 | //config:config FEATURE_IFUPDOWN_IFCONFIG_BUILTIN | ||
| 77 | //config: bool "Use busybox ifconfig and route applets" | ||
| 78 | //config: default n | ||
| 79 | //config: depends on (IFUP || IFDOWN) && !FEATURE_IFUPDOWN_IP | ||
| 80 | //config: select IFCONFIG | ||
| 81 | //config: select ROUTE | ||
| 82 | //config: help | ||
| 83 | //config: Use the busybox iproute "ifconfig" and "route" applets to | ||
| 84 | //config: implement the "ifup" and "ifdown" utilities. | ||
| 85 | //config: | 64 | //config: |
| 86 | //config: If left disabled, you must install the full-blown ifconfig | 65 | //config: If N: you must install either the full-blown ifconfig and route |
| 87 | //config: and route utilities, or the "ifup" and "ifdown" applets will not | 66 | //config: utilities, or enable these applets in Busybox. |
| 88 | //config: work. | ||
| 89 | //config: | 67 | //config: |
| 90 | //config:config FEATURE_IFUPDOWN_IPV4 | 68 | //config:config FEATURE_IFUPDOWN_IPV4 |
| 91 | //config: bool "Support for IPv4" | 69 | //config: bool "Support for IPv4" |