X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=build-devtoolbox;h=ff11b23215d6e63e5374504e2f45f6416b6fa8fd;hp=a07c6bb0bde55806000283105c9a431e01a07d3d;hb=bb74c24e8819d3731fab11baadec6642ee1fd858;hpb=f3dbee55b747554e80f25dde91590ff08f480fdc diff --git a/build-devtoolbox b/build-devtoolbox index a07c6bb..ff11b23 100755 --- a/build-devtoolbox +++ b/build-devtoolbox @@ -19,12 +19,6 @@ 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 # this just refuses to rpm -i normally @@ -56,10 +50,13 @@ 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 +# HACK: not available for F33 yet +if [ "$VERSION_ID" != 33 ]; then + 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 +fi sudo dnf clean packages