aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2020-06-16 10:58:01 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2020-06-16 11:00:15 +0000
commit40d5521924fa1b0749289dd0552a7be47a0bb7f6 (patch)
treeea154b4ad78b0b73262940b49ef2c4dd07495810
parent034c581ea9084474b2c325c6f11c5afbc753da5f (diff)
downloadaports-40d5521924fa1b0749289dd0552a7be47a0bb7f6.tar.gz
aports-40d5521924fa1b0749289dd0552a7be47a0bb7f6.tar.bz2
aports-40d5521924fa1b0749289dd0552a7be47a0bb7f6.tar.xz
main/busybox: fix udhcpc script with multiple interfaces
Do not overwrite resolv.conf if there are no dns servers from dhcp. This fixes issue with alpine as virtualbox guest with one nat (dhcp) interface and one host-only (dhcp) interface. ref #11598
-rw-r--r--main/busybox/APKBUILD4
-rw-r--r--main/busybox/default.script2
2 files changed, 3 insertions, 3 deletions
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index c3faf1db87..dd9587c673 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
pkgver=1.31.1
-pkgrel=20
+pkgrel=21
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url="https://busybox.net/"
arch="all"
@@ -242,4 +242,4 @@ aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f03
0becc2186d6c32fb0c401cf7bc0e46268b38ce8892db33be1daf40273024c1c02d518283f44086a313a2ccef34230a1d945ec148cc173f26e6aa9d88a7426e54 bbsuid.c
b993ce589685d5d1f806153d0b7f71657f2d37556654ec60884130a40f09acc4944a13e0a4d02914000bedd779e5a35da08c760fed5f7ca5b601243aff7ba2c9 dad.if-up
646ad9aefe3596d0170d92c8506ca1846e43b5b83cbef97ae565f15ffa7b14665a8c7061bc69c608c043f834c134c5d63f042509f8999031e89163508a868e46 ssl_client.c
-788e3525af419dadff5a46f672b9356a1d9f8a3360523e8e247b926a67180212a002adb2499293d3455cce67a95ed8e2c27f9327ae1a5271f6e7f320dc1c2b98 default.script"
+c047594a1a3c685f679b98bb80015020ed51e7502c0b2f535f8483a8852b8d43b894b36f34ba680ef96a52c67f3d1af706edbfe43c4a2117c469bb2967215252 default.script"
diff --git a/main/busybox/default.script b/main/busybox/default.script
index 8c786f8740..2b787b1484 100644
--- a/main/busybox/default.script
+++ b/main/busybox/default.script
@@ -84,7 +84,7 @@ resolvconf() {
local i
[ -n "$IF_PEER_DNS" ] && [ "$IF_PEER_DNS" != "yes" ] && return
if [ "$RESOLV_CONF" = "no" ] || [ "$RESOLV_CONF" = "NO" ] \
- || [ -z "$RESOLV_CONF" ]; then
+ || [ -z "$RESOLV_CONF" ] || [ -z "$dns" ]; then
return
fi
for i in $NO_DNS; do