From: Martin Pitt <martin@piware.de>
Date: Tue, 1 Sep 2020 05:16:43 +0000 (+0200)
Subject: build-*-toolbox: Drop resolv.conf workaround
X-Git-Url: https://piware.de/gitweb/?a=commitdiff_plain;h=3ba8040b33aacbed853fa501fa2d6585beeb6715;p=bin.git

build-*-toolbox: Drop resolv.conf workaround

https://bugzilla.redhat.com/show_bug.cgi?id=1785244 got fixed in toolbox
0.0.95.
---

diff --git a/build-debian-toolbox b/build-debian-toolbox
index f978ee1..e1b8578 100755
--- a/build-debian-toolbox
+++ b/build-debian-toolbox
@@ -10,11 +10,6 @@ toolbox -y create -c $RELEASE --image docker.io/$DISTRO:$RELEASE
 # can't do that with toolbox run yet, as we need to install sudo first
 podman start $RELEASE
 podman exec -it $RELEASE sh -exc '
-# https://bugzilla.redhat.com/show_bug.cgi?id=1785244, https://github.com/containers/toolbox/pull/380
-if [ ! -e /etc/resolv.conf ]; then
-    ln -sfn /run/host/monitor/resolv.conf /etc/resolv.conf
-fi
-
 # go-faster apt/dpkg
 echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/unsafe-io
 
diff --git a/build-devtoolbox b/build-devtoolbox
index ce814a6..2253730 100755
--- a/build-devtoolbox
+++ b/build-devtoolbox
@@ -14,11 +14,6 @@ yes | toolbox create $RELEASE -c $NAME
 
 # install cockpit's build deps and other development tools
 toolbox run -c "$NAME" sh -exc '
-# https://bugzilla.redhat.com/show_bug.cgi?id=1785244
-if [ ! -e /etc/resolv.conf ]; then
-    sudo ln -sfn /run/host/monitor/resolv.conf /etc/resolv.conf
-fi
-
 # useful hostname
 . /etc/os-release
 echo "${ID}-${VERSION_ID}" | sudo tee /etc/hostname