build-devtoolbox: Fix resolv.conf link

[bin.git] / build-devtoolbox

diff --git a/build-devtoolbox b/build-devtoolbox
index 58fd3db6de1f3ee4bcc5af2fdee8db63875f12c6..07dc22184ab3237c4e6f4f85dcf37ba2cb9912fb 100755 (executable)
--- a/build-devtoolbox
+++ b/build-devtoolbox
@@ -19,13 +19,8 @@ toolbox run -c "$NAME" sh -exc '
 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
+sudo ln -sfn ../run/host/run/NetworkManager/resolv.conf /etc/resolv.conf
 
 # this just refuses to rpm -i normally
 sudo dnf install -y cpio
@@ -41,26 +36,14 @@ sudo dnf install -y make npm fontconfig git valgrind chromium \
     man-pages socat wget genisoimage vim-enhanced \
     ansible python3-boto python3-boto3 standard-test-roles rsync strace diffstat \
     pwgen glibc-langpack-en tig twine dbus-daemon \
-    pandoc texlive-ec \
-    /usr/bin/scanimage /usr/bin/pngquant /usr/bin/convert /usr/bin/pdfjoin \
+    pandoc texlive-ec texlive-pdfjam \
+    /usr/bin/scanimage /usr/bin/pngquant /usr/bin/convert \
     calibre qt5-qtwayland keepassxc
 
 sudo dnf debuginfo-install -y glib2 glibc libssh gnutls
 
-# HACK: rcmtools not available for F33 yet
-if [ "$VERSION_ID" != 33 ]; then
-    (cd /etc/yum.repos.d; sudo curl -O --location https://download.devel.redhat.com/rel-eng/RCMTOOLS/rcm-tools-fedora.repo)
-    sudo dnf install -y rhpkg
-fi
-
 type gh >/dev/null 2>&1 || sudo dnf install -y $(curl -s https://api.github.com/repos/cli/cli/releases/latest | grep -o https:.*_linux_amd64.rpm)
 
-# 1minutetip
-sudo umount /mnt  # HACK: rhts-test-env-5.0-2.fc32eng.noarch wants to fiddle with it
-sudo wget -O /etc/yum.repos.d/qa-tools.repo http://liver.brq.redhat.com/repo/qa-tools.repo
-sudo wget -O /etc/yum.repos.d/beaker-client.repo http://download.lab.bos.redhat.com/beakerrepos/beaker-client-Fedora.repo
-sudo dnf install -y qa-tools-workstation-1minutetip
-
 sudo dnf clean packages
 
 # unbreak kerberos; https://github.com/debarshiray/toolbox/issues/235