From 084d4ace9f8e67a0af6474a6f2b3df9fc2197d5d Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 11 Feb 2024 02:40:52 +0900 Subject: [PATCH 1/2] CentOS/RHEL: Use dnf if available ... instead of yum. The yum command is no longer available by default in recent versions. Closes #394 Signed-off-by: Takashi Kajinami --- install.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index a42f21e..9ee6742 100755 --- a/install.sh +++ b/install.sh @@ -559,19 +559,24 @@ do_install() { echo "Packages for RHEL are currently only available for s390x." exit 1 fi - if [ "$lsb_dist" = "fedora" ]; then + + if command_exists dnf; then pkg_manager="dnf" config_manager="dnf config-manager" enable_channel_flag="--set-enabled" disable_channel_flag="--set-disabled" pre_reqs="dnf-plugins-core" - pkg_suffix="fc$dist_version" else pkg_manager="yum" config_manager="yum-config-manager" enable_channel_flag="--enable" disable_channel_flag="--disable" pre_reqs="yum-utils" + fi + + if [ "$lsb_dist" = "fedora" ]; then + pkg_suffix="fc$dist_version" + else pkg_suffix="el" fi repo_file_url="$DOWNLOAD_URL/linux/$lsb_dist/$REPO_FILE" From 253a8c0c37cf39e8279b10a47df7f46d7fb9647b Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard Date: Thu, 29 Feb 2024 07:02:41 -0700 Subject: [PATCH 2/2] el: use DNF in --best mode Signed-off-by: Bjorn Neergaard --- install.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 9ee6742..4b9739c 100755 --- a/install.sh +++ b/install.sh @@ -562,12 +562,14 @@ do_install() { if command_exists dnf; then pkg_manager="dnf" + pkg_manager_flags="--best" config_manager="dnf config-manager" enable_channel_flag="--set-enabled" disable_channel_flag="--set-disabled" pre_reqs="dnf-plugins-core" else pkg_manager="yum" + pkg_manager_flags="" config_manager="yum-config-manager" enable_channel_flag="--enable" disable_channel_flag="--disable" @@ -584,7 +586,7 @@ do_install() { if ! is_dry_run; then set -x fi - $sh_c "$pkg_manager install -y -q $pre_reqs" + $sh_c "$pkg_manager $pkg_manager_flags install -y -q $pre_reqs" $sh_c "$config_manager --add-repo $repo_file_url" if [ "$CHANNEL" != "stable" ]; then @@ -637,7 +639,7 @@ do_install() { if ! is_dry_run; then set -x fi - $sh_c "$pkg_manager install -y -q $pkgs" + $sh_c "$pkg_manager $pkg_manager_flags install -y -q $pkgs" ) echo_docker_as_nonroot exit 0