]> piware.de Git - bin.git/commitdiff
build-devtoolbox: Fix resolv.conf for resolved
authorMartin Pitt <martin@piware.de>
Sun, 22 Sep 2019 08:33:12 +0000 (10:33 +0200)
committerMartin Pitt <martin@piware.de>
Sun, 22 Sep 2019 08:33:12 +0000 (10:33 +0200)
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.

build-devtoolbox

index 3bb60a8c7ce6e25973705786881db5238147a2cc..a2f8c2f891d029e4e021786fa5f9137c19656e78 100755 (executable)
@@ -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/*"