udhcpc: add -o "do not request options by default" switch

(by L. Gabriel Somlo <somlo AT cmu.edu>)

function                                             old     new   delta
udhcpc_main                                         2513    2554     +41
static.udhcpc_longopts                               226     247     +21
add_param_req_option                                 119     132     +13
packed_usage                                       23952   23964     +12
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 4/0 up/down: 87/0)               Total: 87 bytes

1 files changed, 3 insertions, 2 deletions

diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 7c31448e8..50b96261b 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -476,7 +476,8 @@ static const struct dhcp_client_t ext_dhcp_clients[] = {
                 "pump -i %iface% -k",
         },
         { "udhcpc",
-                "udhcpc -R -n -p /var/run/udhcpc.%iface%.pid -i %iface%[[ -H %hostname%]][[ -c %clientid%]][[ -s %script%]][[ -t %retries%]]",
+                "udhcpc -R -n -p /var/run/udhcpc.%iface%.pid -i %iface%[[ -H %hostname%]][[ -c %clientid%]]"
+                                "[[ -s %script%]][[ %udhcpc_opts%]]",
                 "kill `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null",
         },
 };
@@ -507,7 +508,7 @@ static int dhcp_up(struct interface_defn_t *ifd, execfn *exec)
                 return 0;
 #endif
         return execute("udhcpc -R -n -p /var/run/udhcpc.%iface%.pid "
-                        "-i %iface%[[ -H %hostname%]][[ -c %clientid%]][[ -s %script%]][[ -t %retries%]]",
+                        "-i %iface%[[ -H %hostname%]][[ -c %clientid%]][[ -s %script%]][[ %udhcpc_opts%]]",
                         ifd, exec);
 }
 #else