From: Martin Pitt <martin@piware.de>
Date: Fri, 18 Dec 2020 07:57:24 +0000 (+0100)
Subject: build-rhtoolbox: Simplify certificate install
X-Git-Url: https://piware.de/gitweb/?a=commitdiff_plain;h=a61da4d9f77b0d947e1926d705ebc6ef339f1188;p=bin.git

build-rhtoolbox: Simplify certificate install

Also move to Fedora 33.
---

diff --git a/build-rhtoolbox b/build-rhtoolbox
index b92ee57..f70b359 100755
--- a/build-rhtoolbox
+++ b/build-rhtoolbox
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eux
 NAME=redhat
-RELEASE=32
+RELEASE=33
 
 toolbox rm --force $NAME || true
 yes | toolbox create --release $RELEASE -c $NAME
@@ -14,9 +14,7 @@ sudo hostname -F /etc/hostname
 
 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/*"
+sudo curl -o /etc/pki/ca-trust/source/anchors/RH-IT-Root-CA.crt https://password.corp.redhat.com/RH-IT-Root-CA.crt
 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)