build-devtoolbox: Fix resolv.conf link

[bin.git] / build-devtoolbox

diff --git a/build-devtoolbox b/build-devtoolbox
index f762596b1c87c2ee09da2fff318152c9014a73ba..07dc22184ab3237c4e6f4f85dcf37ba2cb9912fb 100755 (executable)
--- a/build-devtoolbox
+++ b/build-devtoolbox
@@ -14,46 +14,36 @@ 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
 
+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
 rpm2cpio ~martin/Dokumente/Arbeit/RedHat/redhat-internal-cert-install-0.1-7.el7.csb.noarch.rpm | sudo cpio -id --directory=/ --verbose "./etc/pki/*"
 sudo update-ca-trust
 
-(cd /etc/yum.repos.d; sudo curl -O --location https://download.devel.redhat.com/rel-eng/RCMTOOLS/rcm-tools-fedora.repo)
-
 sudo dnf builddep -y cockpit
 sudo dnf install -y make npm fontconfig git valgrind chromium \
     libvirt-daemon-kvm libvirt-client python3-libvirt \
     virt-viewer virt-install libappstream-glib \
     expect python3-pycodestyle python3-pyflakes \
-    fedpkg rhpkg /usr/bin/oc /usr/bin/genisoimage /usr/bin/pip \
+    fedpkg /usr/bin/oc /usr/bin/genisoimage /usr/bin/pip \
     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 waiverdb-cli \
-    pandoc texlive-ec \
-    /usr/bin/scanimage /usr/bin/pngquant /usr/bin/convert /usr/bin/pdfjoin \
-    calibre qt5-qtwayland
+    pwgen glibc-langpack-en tig twine dbus-daemon \
+    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
 
 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