build-devtoolbox: Fix broken Fedora 33 image

[bin.git] / build-devtoolbox

diff --git a/build-devtoolbox b/build-devtoolbox
index ce814a6defe77ba320515fca445436ccd0b9ef63..7685fb352efae08d53cf89266f4ad41c6ddfda3f 100755 (executable)
--- a/build-devtoolbox
+++ b/build-devtoolbox
@@ -14,16 +14,19 @@ 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
 sudo hostname -F /etc/hostname
 
+# https://github.com/containers/toolbox/issues/552
+if [ "$VERSION_ID" = 33 ]; then
+    sudo rm -f /etc/yum.repos.d/*rawhide*
+    sudo dnf config-manager --set-enabled fedora --set-enabled updates
+fi
+
+sudo dnf update -y
+
 # 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/*"