X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/f52d66ff00b24111f87c274d3d7085ef2e1d27b1..632f858731d8741a93c77daf1aceed2fd45e193d:/package/busybox/config/networking/udhcp/Config.in

diff --git a/package/busybox/config/networking/udhcp/Config.in b/package/busybox/config/networking/udhcp/Config.in
index 741afa327..04a2ada17 100644
--- a/package/busybox/config/networking/udhcp/Config.in
+++ b/package/busybox/config/networking/udhcp/Config.in
@@ -3,8 +3,6 @@
 # see scripts/kbuild/config-language.txt.
 #
 
-menu "udhcp Server/Client"
-
 config BUSYBOX_CONFIG_APP_UDHCPD
 	bool "udhcp Server (udhcpd)"
 	default n
@@ -14,17 +12,14 @@ config BUSYBOX_CONFIG_APP_UDHCPD
 
 	  See http://udhcp.busybox.net for further details.
 
-config BUSYBOX_CONFIG_APP_UDHCPC
-	bool "udhcp Client (udhcpc)"
-	default y
+config BUSYBOX_CONFIG_APP_DHCPRELAY
+	bool "dhcprelay"
+	default n
+	depends on BUSYBOX_CONFIG_APP_UDHCPD
 	help
-	  uDHCPc is a DHCP client geared primarily toward embedded systems,
-	  while striving to be fully functional and RFC compliant.
-
-	  The udhcp client negotiates a lease with the DHCP server and
-	  notifies a set of scripts when a lease is obtained or lost.
-
-	  See http://udhcp.busybox.net for further details.
+	  dhcprelay listens for dhcp requests on one or more interfaces
+	  and forwards these requests to a different interface or dhcp
+	  server.
 
 config BUSYBOX_CONFIG_APP_DUMPLEASES
 	bool "Lease display utility (dumpleases)"
@@ -37,18 +32,31 @@ config BUSYBOX_CONFIG_APP_DUMPLEASES
 
 	  See http://udhcp.busybox.net for further details.
 
+config BUSYBOX_CONFIG_APP_UDHCPC
+	bool "udhcp Client (udhcpc)"
+	default y
+	help
+	  uDHCPc is a DHCP client geared primarily toward embedded systems,
+	  while striving to be fully functional and RFC compliant.
+
+	  The udhcp client negotiates a lease with the DHCP server and
+	  notifies a set of scripts when a lease is obtained or lost.
+
+	  See http://udhcp.busybox.net for further details.
+
 config BUSYBOX_CONFIG_FEATURE_UDHCP_SYSLOG
-	bool "  Log udhcp messages to syslog (instead of stdout)"
+	bool "Log udhcp messages to syslog"
 	default n
 	depends on BUSYBOX_CONFIG_APP_UDHCPD || BUSYBOX_CONFIG_APP_UDHCPC
+	select BUSYBOX_CONFIG_FEATURE_SYSLOG
 	help
-	  If selected, udhcpd will log all its messages to syslog, otherwise,
-	  it will attempt to log them to stdout.
+	  If not daemonized, udhcpd prints its messages to stdout/stderr.
+	  If this option is selected, it will also log them to syslog.
 
 	  See http://udhcp.busybox.net for further details.
 
 config BUSYBOX_CONFIG_FEATURE_UDHCP_DEBUG
-	bool "  Compile udhcp with noisy debugging messages"
+	bool "Compile udhcp with noisy debugging messages"
 	default n
 	depends on BUSYBOX_CONFIG_APP_UDHCPD || BUSYBOX_CONFIG_APP_UDHCPC
 	help
@@ -57,6 +65,3 @@ config BUSYBOX_CONFIG_FEATURE_UDHCP_DEBUG
 	  the background.
 
 	  See http://udhcp.busybox.net for further details.
-
-endmenu
-