diff options
| author | Simon Rettberg | 2014-02-15 19:58:54 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2014-02-15 19:58:54 +0100 |
| commit | cae71bbe619c18a7a38c3b82a46476c9108b7f01 (patch) | |
| tree | 917d3437d0c05cf74da09ccb2b5fe35af7d97d16 /remote/modules/dhcpc-busybox | |
| parent | [rfs-stage32] Make sure addons are inserted into the aufs stack before stage4... (diff) | |
| download | tm-scripts-cae71bbe619c18a7a38c3b82a46476c9108b7f01.tar.gz tm-scripts-cae71bbe619c18a7a38c3b82a46476c9108b7f01.tar.xz tm-scripts-cae71bbe619c18a7a38c3b82a46476c9108b7f01.zip | |
[busybox/udhcpc] Enable RFC3397 "domain search" option (and use it if present)
Diffstat (limited to 'remote/modules/dhcpc-busybox')
| -rwxr-xr-x | remote/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/remote/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx b/remote/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx index 58b1d144..4edce5fc 100755 --- a/remote/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx +++ b/remote/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx @@ -76,9 +76,16 @@ case "$1" in # Update resolver configuration file CONF="" if [ -n "$domain" ]; then - printf -v CONF "domain $domain\nsearch $domain\n" + printf -v CONF "domain $domain\n" elif [ -n "$SLX_NET_DOMAIN" ]; then - printf -v CONF "domain $SLX_NET_DOMAIN\nsearch $SLX_NET_DOMAIN\n" + printf -v CONF "domain $SLX_NET_DOMAIN\n" + fi + if [ -n "$search" ]; then + printf -v CONF "search $search\n" + elif [ -n "$SLX_SEARCH_DOMAIN" ]; then + printf -v CONF "search $SLX_SEARCH_DOMAIN\n" + elif [ -n "$SLX_NET_DOMAIN" ]; then + printf -v CONF "search $SLX_NET_DOMAIN\n" fi for i in $dns; do echo "$0: Adding DNS $i" |