diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-08-25 21:57:32 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-08-26 16:22:41 +0000 |
| commit | 5fd04a3cc9b1bb74d736c8e47ce390c0dc299e6c (patch) | |
| tree | 0cd09b9160cc0f524682f8cca2b1319b15b5e385 | |
| parent | 9010ed09783f953f11504fe4a0265babcf7bdd1f (diff) | |
| download | aports-5fd04a3cc9b1bb74d736c8e47ce390c0dc299e6c.tar.bz2 aports-5fd04a3cc9b1bb74d736c8e47ce390c0dc299e6c.tar.xz | |
Revert "main/busybox-initscripts: fix default.script DHCP behaviour"
Logic was broken.
This reverts commit 703e83eaed5020ebe2aa4dbfdfce21259abf2e83.
| -rw-r--r-- | main/busybox-initscripts/default.script | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/main/busybox-initscripts/default.script b/main/busybox-initscripts/default.script index 6bbb8b6f20..511c540bec 100644 --- a/main/busybox-initscripts/default.script +++ b/main/busybox-initscripts/default.script @@ -83,27 +83,11 @@ resolvconf() { for i in $NO_DNS; do [ "$i" = "$interface" ] && return 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 - + echo -n > "$RESOLV_CONF" + [ -n "$domain" ] && echo "search $domain" >> "$RESOLV_CONF" + for i in $dns; do + echo "nameserver $i" >> "$RESOLV_CONF" + done } bound() { |