Merge branch 'rocky-linux:main' into oracle-streams

This commit is contained in:
Peter Ajamian 2021-07-16 09:52:42 +12:00 committed by GitHub
commit fdc62f376f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -358,6 +358,9 @@ safednf () (
)
collect_system_info () {
# Dump the DNF cache first so we start with a clean slate.
infomsg $'\nRemoving dnf cache\n'
rm -rf /var/cache/{yum,dnf}
# Check the efi mount first, so we can bail before wasting time on all these
# other checks if it's not there.
if [[ $update_efi ]]; then
@ -749,8 +752,6 @@ EOF
fi
# Distrosync
infomsg $'\nRemoving dnf cache\n'
rm -rf /var/cache/{yum,dnf}
infomsg $'Ensuring repos are enabled before the package swap\n'
safednf -y --enableplugin=config-manager config-manager \
--set-enabled "${!repo_map[@]}" || {