From: Martin Pitt <martin@piware.de>
Date: Sun, 22 Sep 2019 08:33:12 +0000 (+0200)
Subject: build-devtoolbox: Fix resolv.conf for resolved
X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=commitdiff_plain;h=2c371586d935a3d583f5598d56b3f293fe93a016

build-devtoolbox: Fix resolv.conf for resolved

If the host has an /etc/resolv.conf pointing to /run, that will be
invalid in the container. Let it point to the already bind-mounted file
from the host.
---

diff --git a/build-devtoolbox b/build-devtoolbox
index 3bb60a8..a2f8c2f 100755
--- a/build-devtoolbox
+++ b/build-devtoolbox
@@ -14,6 +14,10 @@ yes | toolbox create $RELEASE -c $NAME
 
 # install cockpit's build deps and other development tools
 toolbox run -c "$NAME" sh -exc '
+if [ ! -e /etc/resolv.conf ]; then
+    sudo ln -sfn /run/host/monitor/resolv.conf /etc/resolv.conf
+fi
+
 # this just refuses to rpm -i normally
 sudo dnf install -y cpio
 rpm2cpio ~martin/Dokumente/Arbeit/RedHat/redhat-internal-cert-install-0.1-7.el7.csb.noarch.rpm | sudo cpio -id --directory=/ --verbose "./etc/pki/*"