diff --git a/build_scripts/base/01-packages.sh b/build_scripts/base/01-packages.sh index e99ff25f..7176d78e 100755 --- a/build_scripts/base/01-packages.sh +++ b/build_scripts/base/01-packages.sh @@ -184,15 +184,7 @@ EXCLUDED_PACKAGES=( podman-docker ) -# Remove excluded packages if they are installed -if [[ "${#EXCLUDED_PACKAGES[@]}" -gt 0 ]]; then - readarray -t INSTALLED_EXCLUDED < <(rpm -qa --queryformat='%{NAME}\n' "${EXCLUDED_PACKAGES[@]}" 2>/dev/null || true) - if [[ "${#INSTALLED_EXCLUDED[@]}" -gt 0 ]]; then - dnf5 -y remove "${INSTALLED_EXCLUDED[@]}" - else - echo "No excluded packages found to remove." - fi -fi +dnf -y remove "${EXCLUDED_PACKAGES[@]}" ## Pins and Overrides ## Use this section to pin packages in order to avoid regressions diff --git a/build_scripts/dx/00-dx.sh b/build_scripts/dx/00-dx.sh index 726a1234..e40df6ee 100755 --- a/build_scripts/dx/00-dx.sh +++ b/build_scripts/dx/00-dx.sh @@ -105,19 +105,6 @@ echo "Installing DX COPR packages with isolated repo enablement..." copr_install_isolated "karmab/kcli" "kcli" copr_install_isolated "ublue-os/packages" "ublue-os-libvirt-workarounds" -# DX packages to exclude - common to all versions -EXCLUDED_PACKAGES=() - -# Remove excluded packages if they are installed -if [[ "${#EXCLUDED_PACKAGES[@]}" -gt 0 ]]; then - readarray -t INSTALLED_EXCLUDED < <(rpm -qa --queryformat='%{NAME}\n' "${EXCLUDED_PACKAGES[@]}" 2>/dev/null || true) - if [[ "${#INSTALLED_EXCLUDED[@]}" -gt 0 ]]; then - dnf5 -y remove "${INSTALLED_EXCLUDED[@]}" - else - echo "No excluded packages found to remove." - fi -fi - rsync -rvK /ctx/system_files/dx/ / # Load iptable_nat module for docker-in-docker.