busybox: Support option 119 in udhcpc default script.
authorIgnacy Gawędzki <ignacy.gawedzki@green-communications.fr>
Thu, 31 Mar 2016 07:34:43 +0000 (09:34 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Sun, 24 Apr 2016 18:58:39 +0000 (20:58 +0200)
* 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 <ignacy.gawedzki@green-communications.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/busybox/udhcpc.script

index 50c52e6fe3e5fb6eeb17b638920de2ec875ea192..ad110d3a7fb642d9a71aded22cafd92134688325 100755 (executable)
@@ -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