diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/busybox-initscripts/default.script | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/main/busybox-initscripts/default.script b/main/busybox-initscripts/default.script index 511c540bec..6bbb8b6f20 100644 --- a/main/busybox-initscripts/default.script +++ b/main/busybox-initscripts/default.script @@ -83,11 +83,27 @@ resolvconf() { for i in $NO_DNS; do [ "$i" = "$interface" ] && return done - echo -n > "$RESOLV_CONF" - [ -n "$domain" ] && echo "search $domain" >> "$RESOLV_CONF" - for i in $dns; do - echo "nameserver $i" >> "$RESOLV_CONF" - done + +# If we are given a domain/dns pair, we use them to replace resolv.conf ... + + if [ -n "$domain" ] && [ -n "$dns" ]; then + echo "search $domain" > "$RESOLV_CONF" + for i in $dns; do + echo "nameserver $i" >> "$RESOLV_CONF" + done + return + fi + +# ... but those who don't like search domains might only give us dns. + + if [ -n "$dns" ]; then + echo -n > "$RESOLV_CONF" + for i in $dns; do + echo "nameserver $i" >> "$RESOLV_CONF" + done + return + fi + } bound() { |