Merge "Ensure yum-utils is installed in epel element"

2020-10-13 09:56:57 +00:00 · 2020-10-13 09:56:57 +00:00 · 061cc48583
commit 061cc48583
parent 91ce15afd1 f13eb1bcea
1 changed files with 3 additions and 0 deletions
--- a/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release
+++ b/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release
@ -35,8 +35,11 @@ fi

 if [ ${DIB_EPEL_DISABLED:-0} -ne 0 ]; then
    if [[ ${YUM} == "dnf" ]]; then
+        rpm  -q dnf-plugins-core || dnf install -y dnf-plugins-core
        dnf config-manager --set-disabled "epel*"
    else
+        # Cannot rely on package-installs, it is executed later
+        rpm  -q yum-utils || yum install -y yum-utils
        yum-config-manager --disable "epel*"
    fi
 fi