From d5e143dcfb007d53aa872dafa968bfb078c9d724 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ignacy=20Gaw=C4=99dzki?= Date: Thu, 31 Mar 2016 09:34:43 +0200 Subject: [PATCH] busybox: Support option 119 in udhcpc default script. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * package/busybox/udhcpc.script: Use $search instead of $domain if that is defined. Note that for this to work, not only has CONFIG_FEATURE_UDHCP_RFC3397 be enabled in Busybox' configuration but also the option has to be requested using the "-O search" command-line option (one can set it in CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS, for instance). [Peter: add comment with reference to rfc3359/option 119 for clarity] Signed-off-by: Ignacy Gawędzki Signed-off-by: Peter Korsgaard --- package/busybox/udhcpc.script | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/package/busybox/udhcpc.script b/package/busybox/udhcpc.script index 50c52e6fe3..ad110d3a7f 100755 --- a/package/busybox/udhcpc.script +++ b/package/busybox/udhcpc.script @@ -56,7 +56,16 @@ case "$1" in cat $TMPFILE > $RESOLV_CONF rm -f $TMPFILE - [ -n "$domain" ] && echo "search $domain # $interface" >> $RESOLV_CONF + # prefer rfc3359 domain search list (option 119) if available + if [ -n "$search" ]; then + search_list=$search + elif [ -n "$domain" ]; then + search_list=$domain + fi + + [ -n "$search_list" ] && + echo "search $search_list # $interface" >> $RESOLV_CONF + for i in $dns ; do echo adding dns $i echo "nameserver $i # $interface" >> $RESOLV_CONF -- 2.30.2