replace APP_xxDHCPxx with xxDHCPxx, it's more consistent with the rest

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
author: Denys Vlasenko <vda.linux@googlemail.com> 2009-12-11 02:21:10 +0100
committer: Denys Vlasenko <vda.linux@googlemail.com> 2009-12-11 02:21:10 +0100
commit: 4662de0511487b4da965c4b2158bae318f3d80a8 (patch)
tree: 05647d5e10ec8ba1a0f50dbe396d2c04bda0c977
parent: 8656676a2199e2701e7e5656ef3d2092dedd9ba5 (diff)
download: busybox-w32-4662de0511487b4da965c4b2158bae318f3d80a8.tar.gz
busybox-w32-4662de0511487b4da965c4b2158bae318f3d80a8.tar.bz2
busybox-w32-4662de0511487b4da965c4b2158bae318f3d80a8.zip
8 files changed, 36 insertions, 36 deletions
diff --git a/TODO_config_nommu b/TODO_config_nommu
index 1835b6e80..d5ee7bebd 100644
--- a/TODO_config_nommu
+++ b/TODO_config_nommu
@@ -743,12 +743,12 @@ CONFIG_TRACEROUTE=y
 CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
 CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y
 CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
-CONFIG_APP_UDHCPD=y
+CONFIG_UDHCPD=y
-CONFIG_APP_DHCPRELAY=y
+CONFIG_DHCPRELAY=y
-CONFIG_APP_DUMPLEASES=y
+CONFIG_DUMPLEASES=y
 CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y
 CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
-CONFIG_APP_UDHCPC=y
+CONFIG_UDHCPC=y
 CONFIG_FEATURE_UDHCPC_ARPING=y
 CONFIG_FEATURE_UDHCP_PORT=y
 CONFIG_UDHCP_DEBUG=9
diff --git a/docs/ifupdown_design.txt b/docs/ifupdown_design.txt
index 9df579289..8008e4507 100644
--- a/docs/ifupdown_design.txt
+++ b/docs/ifupdown_design.txt
@@ -26,7 +26,7 @@ static int dhcp_down(struct interface_defn_t *ifd, execfn *exec)
       }
       bb_error_msg("no dhcp clients found, using static interface shutdown");
       return static_down(ifd, exec);
-#elif ENABLE_APP_UDHCPC
+#elif ENABLE_UDHCPC
       return execute("kill "
                      "`cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
 #else
diff --git a/include/applets.h b/include/applets.h
index 69dcdc002..2d784bd84 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -123,7 +123,7 @@ IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP,
 IF_DEVFSD(APPLET(devfsd, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_DEVMEM(APPLET(devmem, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_DF(APPLET(df, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_APP_DHCPRELAY(APPLET(dhcprelay, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
+IF_DHCPRELAY(APPLET(dhcprelay, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_DIFF(APPLET(diff, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_DIRNAME(APPLET_NOFORK(dirname, dirname, _BB_DIR_USR_BIN, _BB_SUID_DROP, dirname))
 IF_DMESG(APPLET(dmesg, _BB_DIR_BIN, _BB_SUID_DROP))
@@ -134,7 +134,7 @@ IF_DPKG(APPLET(dpkg, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_DPKG_DEB(APPLET_ODDNAME(dpkg-deb, dpkg_deb, _BB_DIR_USR_BIN, _BB_SUID_DROP, dpkg_deb))
 IF_DU(APPLET(du, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_DUMPKMAP(APPLET(dumpkmap, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_APP_DUMPLEASES(APPLET(dumpleases, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+IF_DUMPLEASES(APPLET(dumpleases, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 //IF_E2FSCK(APPLET(e2fsck, _BB_DIR_SBIN, _BB_SUID_DROP))
 //IF_E2LABEL(APPLET_ODDNAME(e2label, tune2fs, _BB_DIR_SBIN, _BB_SUID_DROP, e2label))
 IF_ECHO(APPLET_NOFORK(echo, echo, _BB_DIR_BIN, _BB_SUID_DROP, echo))
@@ -403,8 +403,8 @@ IF_TTY(APPLET(tty, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_TTYSIZE(APPLET(ttysize, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_TUNCTL(APPLET(tunctl, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_MKFS_EXT2(APPLET(tune2fs, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_APP_UDHCPC(APPLET(udhcpc, _BB_DIR_SBIN, _BB_SUID_DROP))
+IF_UDHCPC(APPLET(udhcpc, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_APP_UDHCPD(APPLET(udhcpd, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
+IF_UDHCPD(APPLET(udhcpd, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_UDPSVD(APPLET_ODDNAME(udpsvd, tcpudpsvd, _BB_DIR_USR_BIN, _BB_SUID_DROP, udpsvd))
 IF_UMOUNT(APPLET(umount, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_UNAME(APPLET(uname, _BB_DIR_BIN, _BB_SUID_DROP))
diff --git a/networking/Config.in b/networking/Config.in
index 668823784..5222b78d4 100644
--- a/networking/Config.in
+++ b/networking/Config.in
@@ -923,7 +923,7 @@ source networking/udhcp/Config.in
 config IFUPDOWN_UDHCPC_CMD_OPTIONS
        string "ifup udhcpc command line options"
        default "-R -n"
-        depends on IFUPDOWN && APP_UDHCPC
+        depends on IFUPDOWN && UDHCPC
        help
          Command line options to pass to udhcpc from ifup.
          Intended to alter options not available in /etc/network/interfaces.
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index b16186ec7..d28c0b867 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -522,7 +522,7 @@ static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd, execfn *exec)
        bb_error_msg("no dhcp clients found");
        return 0;
 }
-#elif ENABLE_APP_UDHCPC
+#elif ENABLE_UDHCPC
 static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd, execfn *exec)
 {
 #if ENABLE_FEATURE_IFUPDOWN_IP
@@ -569,7 +569,7 @@ static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd, execfn *exec)
        result += static_down(ifd, exec);
        return ((result == 3) ? 3 : 0);
 }
-#elif ENABLE_APP_UDHCPC
+#elif ENABLE_UDHCPC
 static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd, execfn *exec)
 {
        int result;
diff --git a/networking/udhcp/Config.in b/networking/udhcp/Config.in
index 5f76dd8d4..fd2a61cc0 100644
--- a/networking/udhcp/Config.in
+++ b/networking/udhcp/Config.in
@@ -3,26 +3,26 @@
 # see scripts/kbuild/config-language.txt.
 #
-config APP_UDHCPD
+config UDHCPD
        bool "udhcp server (udhcpd)"
        default n
        help
          udhcpd is a DHCP server geared primarily toward embedded systems,
          while striving to be fully functional and RFC compliant.
-config APP_DHCPRELAY
+config DHCPRELAY
        bool "dhcprelay"
        default n
-        depends on APP_UDHCPD
+        depends on UDHCPD
        help
          dhcprelay listens for dhcp requests on one or more interfaces
          and forwards these requests to a different interface or dhcp
          server.
-config APP_DUMPLEASES
+config DUMPLEASES
        bool "Lease display utility (dumpleases)"
        default n
-        depends on APP_UDHCPD
+        depends on UDHCPD
        help
          dumpleases displays the leases written out by the udhcpd server.
          Lease times are stored in the file by time remaining in lease, or
@@ -31,7 +31,7 @@ config APP_DUMPLEASES
 config FEATURE_UDHCPD_WRITE_LEASES_EARLY
        bool "Rewrite the lease file at every new acknowledge"
        default n
-        depends on APP_UDHCPD
+        depends on UDHCPD
        help
          If selected, udhcpd will write a new file with leases every
          time a new lease has been accepted, thus eliminating the need
@@ -41,12 +41,12 @@ config FEATURE_UDHCPD_WRITE_LEASES_EARLY
 config DHCPD_LEASES_FILE
        string "Absolute path to lease file"
        default "/var/lib/misc/udhcpd.leases"
-        depends on APP_UDHCPD
+        depends on UDHCPD
        help
          udhcpd stores addresses in a lease file. This is the absolute path
          of the file. Normally it is safe to leave it untouched.
-config APP_UDHCPC
+config UDHCPC
        bool "udhcp client (udhcpc)"
        default n
        help
@@ -59,7 +59,7 @@ config APP_UDHCPC
 config FEATURE_UDHCPC_ARPING
        bool "Verify that the offered address is free, using ARP ping"
        default y
-        depends on APP_UDHCPC
+        depends on UDHCPC
        help
          If selected, udhcpc will send ARP probes and make sure
          the offered address is really not in use by anyone. The client
@@ -69,7 +69,7 @@ config FEATURE_UDHCPC_ARPING
 config FEATURE_UDHCP_PORT
        bool "Enable '-P port' option for udhcpd and udhcpc"
        default n
-        depends on APP_UDHCPD || APP_UDHCPC
+        depends on UDHCPD || UDHCPC
        help
          At the cost of ~300 bytes, enables -P port option.
          This feature is typically not needed.
@@ -78,7 +78,7 @@ config UDHCP_DEBUG
        int "Maximum verbosity level for udhcp applets (0..9)"
        default 0
        range 0 9
-        depends on APP_UDHCPD || APP_UDHCPC || APP_DHCPRELAY
+        depends on UDHCPD || UDHCPC || DHCPRELAY
        help
          Verbosity can be increased with multiple -v options.
          This options controls how high it can be cranked up.
@@ -89,7 +89,7 @@ config UDHCP_DEBUG
 config FEATURE_UDHCP_RFC3397
        bool "Support for RFC3397 domain search (experimental)"
        default n
-        depends on APP_UDHCPD || APP_UDHCPC
+        depends on UDHCPD || UDHCPC
        help
          If selected, both client and server will support passing of domain
          search lists via option 119, specified in RFC3397.
@@ -97,7 +97,7 @@ config FEATURE_UDHCP_RFC3397
 config UDHCPC_DEFAULT_SCRIPT
        string "Absolute path to config script"
        default "/usr/share/udhcpc/default.script"
-        depends on APP_UDHCPC
+        depends on UDHCPC
        help
          This script is called after udhcpc receives an answer. See
          examples/udhcp for a working example. Normally it is safe
@@ -107,7 +107,7 @@ config UDHCPC_SLACK_FOR_BUGGY_SERVERS
        int "DHCP options slack buffer size"
        default 80
        range 0 924
-        depends on APP_UDHCPD || APP_UDHCPC
+        depends on UDHCPD || UDHCPC
        help
          Some buggy DHCP servers send DHCP offer packets with option
          field larger than we expect (which might also be considered a
diff --git a/networking/udhcp/Kbuild b/networking/udhcp/Kbuild
index e938076f7..d1d35670f 100644
--- a/networking/udhcp/Kbuild
+++ b/networking/udhcp/Kbuild
@@ -6,20 +6,20 @@
 #
 lib-y:=
-lib-$(CONFIG_APP_UDHCPC)        += common.o options.o packet.o \
+lib-$(CONFIG_UDHCPC)            += common.o options.o packet.o \
                                   signalpipe.o socket.o
-lib-$(CONFIG_APP_UDHCPD)        += common.o options.o packet.o \
+lib-$(CONFIG_UDHCPD)            += common.o options.o packet.o \
                                   signalpipe.o socket.o
-lib-$(CONFIG_APP_UDHCPC)        += dhcpc.o clientpacket.o clientsocket.o \
+lib-$(CONFIG_UDHCPC)            += dhcpc.o clientpacket.o clientsocket.o \
                                   script.o
 UDHCPC_NEEDS_ARPING-$(CONFIG_FEATURE_UDHCPC_ARPING) = y
 lib-$(UDHCPC_NEEDS_ARPING-y)    += arpping.o
-lib-$(CONFIG_APP_UDHCPD)        += dhcpd.o arpping.o files.o leases.o \
+lib-$(CONFIG_UDHCPD)            += dhcpd.o arpping.o files.o leases.o \
                                   serverpacket.o static_leases.o
-lib-$(CONFIG_APP_DUMPLEASES)    += dumpleases.o
+lib-$(CONFIG_DUMPLEASES)        += dumpleases.o
-lib-$(CONFIG_APP_DHCPRELAY)     += dhcprelay.o
+lib-$(CONFIG_DHCPRELAY)         += dhcprelay.o
 lib-$(CONFIG_FEATURE_UDHCP_RFC3397) += domain_codec.o
diff --git a/scripts/defconfig b/scripts/defconfig
index f8a92d4c3..a98c7b6fa 100644
--- a/scripts/defconfig
+++ b/scripts/defconfig
@@ -744,12 +744,12 @@ CONFIG_TRACEROUTE=y
 CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
 # CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
 # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-CONFIG_APP_UDHCPD=y
+CONFIG_UDHCPD=y
-CONFIG_APP_DHCPRELAY=y
+CONFIG_DHCPRELAY=y
-CONFIG_APP_DUMPLEASES=y
+CONFIG_DUMPLEASES=y
 CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y
 CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
-CONFIG_APP_UDHCPC=y
+CONFIG_UDHCPC=y
 CONFIG_FEATURE_UDHCPC_ARPING=y
 CONFIG_FEATURE_UDHCP_PORT=y
 CONFIG_UDHCP_DEBUG=9
author	Denys Vlasenko <vda.linux@googlemail.com>	2009-12-11 02:21:10 +0100
committer	Denys Vlasenko <vda.linux@googlemail.com>	2009-12-11 02:21:10 +0100
commit	4662de0511487b4da965c4b2158bae318f3d80a8 (patch)
tree	05647d5e10ec8ba1a0f50dbe396d2c04bda0c977
parent	8656676a2199e2701e7e5656ef3d2092dedd9ba5 (diff)
download	busybox-w32-4662de0511487b4da965c4b2158bae318f3d80a8.tar.gz busybox-w32-4662de0511487b4da965c4b2158bae318f3d80a8.tar.bz2 busybox-w32-4662de0511487b4da965c4b2158bae318f3d80a8.zip

diff --git a/TODO_config_nommu b/TODO_config_nommu index 1835b6e80..d5ee7bebd 100644 --- a/TODO_config_nommu +++ b/TODO_config_nommu
@@ -743,12 +743,12 @@ CONFIG_TRACEROUTE=y
743	CONFIG_FEATURE_TRACEROUTE_VERBOSE=y	743	CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
744	CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y	744	CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y
745	CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y	745	CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
746	CONFIG_APP_UDHCPD=y	746	CONFIG_UDHCPD=y
747	CONFIG_APP_DHCPRELAY=y	747	CONFIG_DHCPRELAY=y
748	CONFIG_APP_DUMPLEASES=y	748	CONFIG_DUMPLEASES=y
749	CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y	749	CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y
750	CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"	750	CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
751	CONFIG_APP_UDHCPC=y	751	CONFIG_UDHCPC=y
752	CONFIG_FEATURE_UDHCPC_ARPING=y	752	CONFIG_FEATURE_UDHCPC_ARPING=y
753	CONFIG_FEATURE_UDHCP_PORT=y	753	CONFIG_FEATURE_UDHCP_PORT=y
754	CONFIG_UDHCP_DEBUG=9	754	CONFIG_UDHCP_DEBUG=9


diff --git a/docs/ifupdown_design.txt b/docs/ifupdown_design.txt index 9df579289..8008e4507 100644 --- a/docs/ifupdown_design.txt +++ b/docs/ifupdown_design.txt
@@ -26,7 +26,7 @@ static int dhcp_down(struct interface_defn_t ifd, execfn exec)
26	}	26	}
27	bb_error_msg("no dhcp clients found, using static interface shutdown");	27	bb_error_msg("no dhcp clients found, using static interface shutdown");
28	return static_down(ifd, exec);	28	return static_down(ifd, exec);
29	#elif ENABLE_APP_UDHCPC	29	#elif ENABLE_UDHCPC
30	return execute("kill "	30	return execute("kill "
31	"`cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);	31	"`cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
32	#else	32	#else


diff --git a/include/applets.h b/include/applets.h index 69dcdc002..2d784bd84 100644 --- a/include/applets.h +++ b/include/applets.h
@@ -123,7 +123,7 @@ IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP,
123	IF_DEVFSD(APPLET(devfsd, _BB_DIR_SBIN, _BB_SUID_DROP))	123	IF_DEVFSD(APPLET(devfsd, _BB_DIR_SBIN, _BB_SUID_DROP))
124	IF_DEVMEM(APPLET(devmem, _BB_DIR_SBIN, _BB_SUID_DROP))	124	IF_DEVMEM(APPLET(devmem, _BB_DIR_SBIN, _BB_SUID_DROP))
125	IF_DF(APPLET(df, _BB_DIR_BIN, _BB_SUID_DROP))	125	IF_DF(APPLET(df, _BB_DIR_BIN, _BB_SUID_DROP))
126	IF_APP_DHCPRELAY(APPLET(dhcprelay, _BB_DIR_USR_SBIN, _BB_SUID_DROP))	126	IF_DHCPRELAY(APPLET(dhcprelay, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
127	IF_DIFF(APPLET(diff, _BB_DIR_USR_BIN, _BB_SUID_DROP))	127	IF_DIFF(APPLET(diff, _BB_DIR_USR_BIN, _BB_SUID_DROP))
128	IF_DIRNAME(APPLET_NOFORK(dirname, dirname, _BB_DIR_USR_BIN, _BB_SUID_DROP, dirname))	128	IF_DIRNAME(APPLET_NOFORK(dirname, dirname, _BB_DIR_USR_BIN, _BB_SUID_DROP, dirname))
129	IF_DMESG(APPLET(dmesg, _BB_DIR_BIN, _BB_SUID_DROP))	129	IF_DMESG(APPLET(dmesg, _BB_DIR_BIN, _BB_SUID_DROP))
@@ -134,7 +134,7 @@ IF_DPKG(APPLET(dpkg, _BB_DIR_USR_BIN, _BB_SUID_DROP))
134	IF_DPKG_DEB(APPLET_ODDNAME(dpkg-deb, dpkg_deb, _BB_DIR_USR_BIN, _BB_SUID_DROP, dpkg_deb))	134	IF_DPKG_DEB(APPLET_ODDNAME(dpkg-deb, dpkg_deb, _BB_DIR_USR_BIN, _BB_SUID_DROP, dpkg_deb))
135	IF_DU(APPLET(du, _BB_DIR_USR_BIN, _BB_SUID_DROP))	135	IF_DU(APPLET(du, _BB_DIR_USR_BIN, _BB_SUID_DROP))
136	IF_DUMPKMAP(APPLET(dumpkmap, _BB_DIR_BIN, _BB_SUID_DROP))	136	IF_DUMPKMAP(APPLET(dumpkmap, _BB_DIR_BIN, _BB_SUID_DROP))
137	IF_APP_DUMPLEASES(APPLET(dumpleases, _BB_DIR_USR_BIN, _BB_SUID_DROP))	137	IF_DUMPLEASES(APPLET(dumpleases, _BB_DIR_USR_BIN, _BB_SUID_DROP))
138	//IF_E2FSCK(APPLET(e2fsck, _BB_DIR_SBIN, _BB_SUID_DROP))	138	//IF_E2FSCK(APPLET(e2fsck, _BB_DIR_SBIN, _BB_SUID_DROP))
139	//IF_E2LABEL(APPLET_ODDNAME(e2label, tune2fs, _BB_DIR_SBIN, _BB_SUID_DROP, e2label))	139	//IF_E2LABEL(APPLET_ODDNAME(e2label, tune2fs, _BB_DIR_SBIN, _BB_SUID_DROP, e2label))
140	IF_ECHO(APPLET_NOFORK(echo, echo, _BB_DIR_BIN, _BB_SUID_DROP, echo))	140	IF_ECHO(APPLET_NOFORK(echo, echo, _BB_DIR_BIN, _BB_SUID_DROP, echo))
@@ -403,8 +403,8 @@ IF_TTY(APPLET(tty, _BB_DIR_USR_BIN, _BB_SUID_DROP))
403	IF_TTYSIZE(APPLET(ttysize, _BB_DIR_USR_BIN, _BB_SUID_DROP))	403	IF_TTYSIZE(APPLET(ttysize, _BB_DIR_USR_BIN, _BB_SUID_DROP))
404	IF_TUNCTL(APPLET(tunctl, _BB_DIR_SBIN, _BB_SUID_DROP))	404	IF_TUNCTL(APPLET(tunctl, _BB_DIR_SBIN, _BB_SUID_DROP))
405	IF_MKFS_EXT2(APPLET(tune2fs, _BB_DIR_SBIN, _BB_SUID_DROP))	405	IF_MKFS_EXT2(APPLET(tune2fs, _BB_DIR_SBIN, _BB_SUID_DROP))
406	IF_APP_UDHCPC(APPLET(udhcpc, _BB_DIR_SBIN, _BB_SUID_DROP))	406	IF_UDHCPC(APPLET(udhcpc, _BB_DIR_SBIN, _BB_SUID_DROP))
407	IF_APP_UDHCPD(APPLET(udhcpd, _BB_DIR_USR_SBIN, _BB_SUID_DROP))	407	IF_UDHCPD(APPLET(udhcpd, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
408	IF_UDPSVD(APPLET_ODDNAME(udpsvd, tcpudpsvd, _BB_DIR_USR_BIN, _BB_SUID_DROP, udpsvd))	408	IF_UDPSVD(APPLET_ODDNAME(udpsvd, tcpudpsvd, _BB_DIR_USR_BIN, _BB_SUID_DROP, udpsvd))
409	IF_UMOUNT(APPLET(umount, _BB_DIR_BIN, _BB_SUID_DROP))	409	IF_UMOUNT(APPLET(umount, _BB_DIR_BIN, _BB_SUID_DROP))
410	IF_UNAME(APPLET(uname, _BB_DIR_BIN, _BB_SUID_DROP))	410	IF_UNAME(APPLET(uname, _BB_DIR_BIN, _BB_SUID_DROP))


diff --git a/networking/Config.in b/networking/Config.in index 668823784..5222b78d4 100644 --- a/networking/Config.in +++ b/networking/Config.in
@@ -923,7 +923,7 @@ source networking/udhcp/Config.in
923	config IFUPDOWN_UDHCPC_CMD_OPTIONS	923	config IFUPDOWN_UDHCPC_CMD_OPTIONS
924	string "ifup udhcpc command line options"	924	string "ifup udhcpc command line options"
925	default "-R -n"	925	default "-R -n"
926	depends on IFUPDOWN && APP_UDHCPC	926	depends on IFUPDOWN && UDHCPC
927	help	927	help
928	Command line options to pass to udhcpc from ifup.	928	Command line options to pass to udhcpc from ifup.
929	Intended to alter options not available in /etc/network/interfaces.	929	Intended to alter options not available in /etc/network/interfaces.


diff --git a/networking/ifupdown.c b/networking/ifupdown.c index b16186ec7..d28c0b867 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c
@@ -522,7 +522,7 @@ static int FAST_FUNC dhcp_up(struct interface_defn_t ifd, execfn exec)
522	bb_error_msg("no dhcp clients found");	522	bb_error_msg("no dhcp clients found");
523	return 0;	523	return 0;
524	}	524	}
525	#elif ENABLE_APP_UDHCPC	525	#elif ENABLE_UDHCPC
526	static int FAST_FUNC dhcp_up(struct interface_defn_t ifd, execfn exec)	526	static int FAST_FUNC dhcp_up(struct interface_defn_t ifd, execfn exec)
527	{	527	{
528	#if ENABLE_FEATURE_IFUPDOWN_IP	528	#if ENABLE_FEATURE_IFUPDOWN_IP
@@ -569,7 +569,7 @@ static int FAST_FUNC dhcp_down(struct interface_defn_t ifd, execfn exec)
569	result += static_down(ifd, exec);	569	result += static_down(ifd, exec);
570	return ((result == 3) ? 3 : 0);	570	return ((result == 3) ? 3 : 0);
571	}	571	}
572	#elif ENABLE_APP_UDHCPC	572	#elif ENABLE_UDHCPC
573	static int FAST_FUNC dhcp_down(struct interface_defn_t ifd, execfn exec)	573	static int FAST_FUNC dhcp_down(struct interface_defn_t ifd, execfn exec)
574	{	574	{
575	int result;	575	int result;


diff --git a/networking/udhcp/Config.in b/networking/udhcp/Config.in index 5f76dd8d4..fd2a61cc0 100644 --- a/networking/udhcp/Config.in +++ b/networking/udhcp/Config.in
@@ -3,26 +3,26 @@
3	# see scripts/kbuild/config-language.txt.	3	# see scripts/kbuild/config-language.txt.
4	#	4	#
5		5
6	config APP_UDHCPD	6	config UDHCPD
7	bool "udhcp server (udhcpd)"	7	bool "udhcp server (udhcpd)"
8	default n	8	default n
9	help	9	help
10	udhcpd is a DHCP server geared primarily toward embedded systems,	10	udhcpd is a DHCP server geared primarily toward embedded systems,
11	while striving to be fully functional and RFC compliant.	11	while striving to be fully functional and RFC compliant.
12		12
13	config APP_DHCPRELAY	13	config DHCPRELAY
14	bool "dhcprelay"	14	bool "dhcprelay"
15	default n	15	default n
16	depends on APP_UDHCPD	16	depends on UDHCPD
17	help	17	help
18	dhcprelay listens for dhcp requests on one or more interfaces	18	dhcprelay listens for dhcp requests on one or more interfaces
19	and forwards these requests to a different interface or dhcp	19	and forwards these requests to a different interface or dhcp
20	server.	20	server.
21		21
22	config APP_DUMPLEASES	22	config DUMPLEASES
23	bool "Lease display utility (dumpleases)"	23	bool "Lease display utility (dumpleases)"
24	default n	24	default n
25	depends on APP_UDHCPD	25	depends on UDHCPD
26	help	26	help
27	dumpleases displays the leases written out by the udhcpd server.	27	dumpleases displays the leases written out by the udhcpd server.
28	Lease times are stored in the file by time remaining in lease, or	28	Lease times are stored in the file by time remaining in lease, or
@@ -31,7 +31,7 @@ config APP_DUMPLEASES
31	config FEATURE_UDHCPD_WRITE_LEASES_EARLY	31	config FEATURE_UDHCPD_WRITE_LEASES_EARLY
32	bool "Rewrite the lease file at every new acknowledge"	32	bool "Rewrite the lease file at every new acknowledge"
33	default n	33	default n
34	depends on APP_UDHCPD	34	depends on UDHCPD
35	help	35	help
36	If selected, udhcpd will write a new file with leases every	36	If selected, udhcpd will write a new file with leases every
37	time a new lease has been accepted, thus eliminating the need	37	time a new lease has been accepted, thus eliminating the need
@@ -41,12 +41,12 @@ config FEATURE_UDHCPD_WRITE_LEASES_EARLY
41	config DHCPD_LEASES_FILE	41	config DHCPD_LEASES_FILE
42	string "Absolute path to lease file"	42	string "Absolute path to lease file"
43	default "/var/lib/misc/udhcpd.leases"	43	default "/var/lib/misc/udhcpd.leases"
44	depends on APP_UDHCPD	44	depends on UDHCPD
45	help	45	help
46	udhcpd stores addresses in a lease file. This is the absolute path	46	udhcpd stores addresses in a lease file. This is the absolute path
47	of the file. Normally it is safe to leave it untouched.	47	of the file. Normally it is safe to leave it untouched.
48		48
49	config APP_UDHCPC	49	config UDHCPC
50	bool "udhcp client (udhcpc)"	50	bool "udhcp client (udhcpc)"
51	default n	51	default n
52	help	52	help
@@ -59,7 +59,7 @@ config APP_UDHCPC
59	config FEATURE_UDHCPC_ARPING	59	config FEATURE_UDHCPC_ARPING
60	bool "Verify that the offered address is free, using ARP ping"	60	bool "Verify that the offered address is free, using ARP ping"
61	default y	61	default y
62	depends on APP_UDHCPC	62	depends on UDHCPC
63	help	63	help
64	If selected, udhcpc will send ARP probes and make sure	64	If selected, udhcpc will send ARP probes and make sure
65	the offered address is really not in use by anyone. The client	65	the offered address is really not in use by anyone. The client
@@ -69,7 +69,7 @@ config FEATURE_UDHCPC_ARPING
69	config FEATURE_UDHCP_PORT	69	config FEATURE_UDHCP_PORT
70	bool "Enable '-P port' option for udhcpd and udhcpc"	70	bool "Enable '-P port' option for udhcpd and udhcpc"
71	default n	71	default n
72	depends on APP_UDHCPD \|\| APP_UDHCPC	72	depends on UDHCPD \|\| UDHCPC
73	help	73	help
74	At the cost of ~300 bytes, enables -P port option.	74	At the cost of ~300 bytes, enables -P port option.
75	This feature is typically not needed.	75	This feature is typically not needed.
@@ -78,7 +78,7 @@ config UDHCP_DEBUG
78	int "Maximum verbosity level for udhcp applets (0..9)"	78	int "Maximum verbosity level for udhcp applets (0..9)"
79	default 0	79	default 0
80	range 0 9	80	range 0 9
81	depends on APP_UDHCPD \|\| APP_UDHCPC \|\| APP_DHCPRELAY	81	depends on UDHCPD \|\| UDHCPC \|\| DHCPRELAY
82	help	82	help
83	Verbosity can be increased with multiple -v options.	83	Verbosity can be increased with multiple -v options.
84	This options controls how high it can be cranked up.	84	This options controls how high it can be cranked up.
@@ -89,7 +89,7 @@ config UDHCP_DEBUG
89	config FEATURE_UDHCP_RFC3397	89	config FEATURE_UDHCP_RFC3397
90	bool "Support for RFC3397 domain search (experimental)"	90	bool "Support for RFC3397 domain search (experimental)"
91	default n	91	default n
92	depends on APP_UDHCPD \|\| APP_UDHCPC	92	depends on UDHCPD \|\| UDHCPC
93	help	93	help
94	If selected, both client and server will support passing of domain	94	If selected, both client and server will support passing of domain
95	search lists via option 119, specified in RFC3397.	95	search lists via option 119, specified in RFC3397.
@@ -97,7 +97,7 @@ config FEATURE_UDHCP_RFC3397
97	config UDHCPC_DEFAULT_SCRIPT	97	config UDHCPC_DEFAULT_SCRIPT
98	string "Absolute path to config script"	98	string "Absolute path to config script"
99	default "/usr/share/udhcpc/default.script"	99	default "/usr/share/udhcpc/default.script"
100	depends on APP_UDHCPC	100	depends on UDHCPC
101	help	101	help
102	This script is called after udhcpc receives an answer. See	102	This script is called after udhcpc receives an answer. See
103	examples/udhcp for a working example. Normally it is safe	103	examples/udhcp for a working example. Normally it is safe
@@ -107,7 +107,7 @@ config UDHCPC_SLACK_FOR_BUGGY_SERVERS
107	int "DHCP options slack buffer size"	107	int "DHCP options slack buffer size"
108	default 80	108	default 80
109	range 0 924	109	range 0 924
110	depends on APP_UDHCPD \|\| APP_UDHCPC	110	depends on UDHCPD \|\| UDHCPC
111	help	111	help
112	Some buggy DHCP servers send DHCP offer packets with option	112	Some buggy DHCP servers send DHCP offer packets with option
113	field larger than we expect (which might also be considered a	113	field larger than we expect (which might also be considered a


diff --git a/networking/udhcp/Kbuild b/networking/udhcp/Kbuild index e938076f7..d1d35670f 100644 --- a/networking/udhcp/Kbuild +++ b/networking/udhcp/Kbuild
@@ -6,20 +6,20 @@
6	#	6	#
7		7
8	lib-y:=	8	lib-y:=
9	lib-$(CONFIG_APP_UDHCPC) += common.o options.o packet.o \	9	lib-$(CONFIG_UDHCPC) += common.o options.o packet.o \
10	signalpipe.o socket.o	10	signalpipe.o socket.o
11	lib-$(CONFIG_APP_UDHCPD) += common.o options.o packet.o \	11	lib-$(CONFIG_UDHCPD) += common.o options.o packet.o \
12	signalpipe.o socket.o	12	signalpipe.o socket.o
13		13
14	lib-$(CONFIG_APP_UDHCPC) += dhcpc.o clientpacket.o clientsocket.o \	14	lib-$(CONFIG_UDHCPC) += dhcpc.o clientpacket.o clientsocket.o \
15	script.o	15	script.o
16		16
17	UDHCPC_NEEDS_ARPING-$(CONFIG_FEATURE_UDHCPC_ARPING) = y	17	UDHCPC_NEEDS_ARPING-$(CONFIG_FEATURE_UDHCPC_ARPING) = y
18	lib-$(UDHCPC_NEEDS_ARPING-y) += arpping.o	18	lib-$(UDHCPC_NEEDS_ARPING-y) += arpping.o
19		19
20	lib-$(CONFIG_APP_UDHCPD) += dhcpd.o arpping.o files.o leases.o \	20	lib-$(CONFIG_UDHCPD) += dhcpd.o arpping.o files.o leases.o \
21	serverpacket.o static_leases.o	21	serverpacket.o static_leases.o
22		22
23	lib-$(CONFIG_APP_DUMPLEASES) += dumpleases.o	23	lib-$(CONFIG_DUMPLEASES) += dumpleases.o
24	lib-$(CONFIG_APP_DHCPRELAY) += dhcprelay.o	24	lib-$(CONFIG_DHCPRELAY) += dhcprelay.o
25	lib-$(CONFIG_FEATURE_UDHCP_RFC3397) += domain_codec.o	25	lib-$(CONFIG_FEATURE_UDHCP_RFC3397) += domain_codec.o


diff --git a/scripts/defconfig b/scripts/defconfig index f8a92d4c3..a98c7b6fa 100644 --- a/scripts/defconfig +++ b/scripts/defconfig
@@ -744,12 +744,12 @@ CONFIG_TRACEROUTE=y
744	CONFIG_FEATURE_TRACEROUTE_VERBOSE=y	744	CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
745	# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set	745	# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
746	# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set	746	# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
747	CONFIG_APP_UDHCPD=y	747	CONFIG_UDHCPD=y
748	CONFIG_APP_DHCPRELAY=y	748	CONFIG_DHCPRELAY=y
749	CONFIG_APP_DUMPLEASES=y	749	CONFIG_DUMPLEASES=y
750	CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y	750	CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y
751	CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"	751	CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
752	CONFIG_APP_UDHCPC=y	752	CONFIG_UDHCPC=y
753	CONFIG_FEATURE_UDHCPC_ARPING=y	753	CONFIG_FEATURE_UDHCPC_ARPING=y
754	CONFIG_FEATURE_UDHCP_PORT=y	754	CONFIG_FEATURE_UDHCP_PORT=y
755	CONFIG_UDHCP_DEBUG=9	755	CONFIG_UDHCP_DEBUG=9