diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-11-23 18:54:59 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-11-23 18:54:59 +0100 |
commit | f7683cdf83f9eb6793b0be34058dcff92e41252d (patch) | |
tree | 35a9e4b4298e42c049a396254de4d56ada7e7bf8 /networking | |
parent | a8e52da7742b2bc8a3993f7f7c3c70da8fe79848 (diff) | |
download | busybox-w32-f7683cdf83f9eb6793b0be34058dcff92e41252d.tar.gz busybox-w32-f7683cdf83f9eb6793b0be34058dcff92e41252d.tar.bz2 busybox-w32-f7683cdf83f9eb6793b0be34058dcff92e41252d.zip |
Convert all udhcp applets to "new style" applet definitions
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
-rw-r--r-- | networking/udhcp/dhcpc.c | 7 | ||||
-rw-r--r-- | networking/udhcp/dhcpd.c | 5 | ||||
-rw-r--r-- | networking/udhcp/dhcprelay.c | 3 | ||||
-rw-r--r-- | networking/udhcp/dumpleases.c | 3 |
4 files changed, 18 insertions, 0 deletions
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c index 1c1051107..0e236261b 100644 --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c | |||
@@ -18,6 +18,13 @@ | |||
18 | * along with this program; if not, write to the Free Software | 18 | * along with this program; if not, write to the Free Software |
19 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 19 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | */ | 20 | */ |
21 | //applet:IF_UDHCPC(APPLET(udhcpc, BB_DIR_SBIN, BB_SUID_DROP)) | ||
22 | |||
23 | //kbuild:lib-$(CONFIG_UDHCPC) += common.o packet.o signalpipe.o socket.o | ||
24 | //kbuild:lib-$(CONFIG_UDHCPC) += dhcpc.o | ||
25 | //kbuild:lib-$(CONFIG_FEATURE_UDHCPC_ARPING) += arpping.o | ||
26 | //kbuild:lib-$(CONFIG_FEATURE_UDHCP_RFC3397) += domain_codec.o | ||
27 | |||
21 | #include <syslog.h> | 28 | #include <syslog.h> |
22 | /* Override ENABLE_FEATURE_PIDFILE - ifupdown needs our pidfile to always exist */ | 29 | /* Override ENABLE_FEATURE_PIDFILE - ifupdown needs our pidfile to always exist */ |
23 | #define WANT_PIDFILE 1 | 30 | #define WANT_PIDFILE 1 |
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c index 56116d01f..e116ba3af 100644 --- a/networking/udhcp/dhcpd.c +++ b/networking/udhcp/dhcpd.c | |||
@@ -20,6 +20,11 @@ | |||
20 | * along with this program; if not, write to the Free Software | 20 | * along with this program; if not, write to the Free Software |
21 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 21 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
22 | */ | 22 | */ |
23 | //applet:IF_UDHCPD(APPLET(udhcpd, BB_DIR_USR_SBIN, BB_SUID_DROP)) | ||
24 | |||
25 | //kbuild:lib-$(CONFIG_UDHCPD) += common.o packet.o signalpipe.o socket.o | ||
26 | //kbuild:lib-$(CONFIG_UDHCPD) += dhcpd.o arpping.o | ||
27 | //kbuild:lib-$(CONFIG_FEATURE_UDHCP_RFC3397) += domain_codec.o | ||
23 | 28 | ||
24 | //usage:#define udhcpd_trivial_usage | 29 | //usage:#define udhcpd_trivial_usage |
25 | //usage: "[-fS] [-I ADDR]" IF_FEATURE_UDHCP_PORT(" [-P N]") " [CONFFILE]" | 30 | //usage: "[-fS] [-I ADDR]" IF_FEATURE_UDHCP_PORT(" [-P N]") " [CONFFILE]" |
diff --git a/networking/udhcp/dhcprelay.c b/networking/udhcp/dhcprelay.c index f52a0cf88..7cb19b14e 100644 --- a/networking/udhcp/dhcprelay.c +++ b/networking/udhcp/dhcprelay.c | |||
@@ -9,6 +9,9 @@ | |||
9 | * Netbeat AG | 9 | * Netbeat AG |
10 | * Upstream has GPL v2 or later | 10 | * Upstream has GPL v2 or later |
11 | */ | 11 | */ |
12 | //applet:IF_DHCPRELAY(APPLET(dhcprelay, BB_DIR_USR_SBIN, BB_SUID_DROP)) | ||
13 | |||
14 | //kbuild:lib-$(CONFIG_DHCPRELAY) += dhcprelay.o | ||
12 | 15 | ||
13 | //usage:#define dhcprelay_trivial_usage | 16 | //usage:#define dhcprelay_trivial_usage |
14 | //usage: "CLIENT_IFACE[,CLIENT_IFACE2]... SERVER_IFACE [SERVER_IP]" | 17 | //usage: "CLIENT_IFACE[,CLIENT_IFACE2]... SERVER_IFACE [SERVER_IP]" |
diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c index 987cc9aff..d83344a8d 100644 --- a/networking/udhcp/dumpleases.c +++ b/networking/udhcp/dumpleases.c | |||
@@ -2,6 +2,9 @@ | |||
2 | /* | 2 | /* |
3 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 3 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
4 | */ | 4 | */ |
5 | //applet:IF_DUMPLEASES(APPLET(dumpleases, BB_DIR_USR_BIN, BB_SUID_DROP)) | ||
6 | |||
7 | //kbuild:lib-$(CONFIG_DUMPLEASES) += dumpleases.o | ||
5 | 8 | ||
6 | //usage:#define dumpleases_trivial_usage | 9 | //usage:#define dumpleases_trivial_usage |
7 | //usage: "[-r|-a] [-d] [-f LEASEFILE]" | 10 | //usage: "[-r|-a] [-d] [-f LEASEFILE]" |