diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 4013fbd..506b610 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -34,7 +34,7 @@ [ -n "${SPCD_URL_PYTHON}" ] || SPCD_URL_PYTHON="https://pypi.org/simple" [ -n "${SPCD_URL_ROCKY}" ] || - SPCD_URL_ROCKY="https://dl.rockylinux.org/\$contentdir" + SPCD_URL_ROCKY="https://dl.rockylinux.org" [ -n "${SPCD_URL_UBUNTU}" ] || SPCD_URL_UBUNTU="https://ubuntu.mirrors.ovh.net/ubuntu" @@ -910,14 +910,36 @@ deb ${SPCD_URL_DEBIAN}-security ${SPCD_OS_VERSION}-security main ;; "${SPCD_OS_ROCKY}") case "${SPCD_OS_VERSION}" in - "8") spcd_spr__file="/etc/yum.repos.d/Rocky-BaseOS.repo" ;; - "9") spcd_spr__file="/etc/yum.repos.d/rocky.repo" ;; + "9") + set -- \ + "rocky" \ + "rocky-addons" \ + "rocky-devel" \ + "rocky-extras" + ;; + "8") + set -- \ + "Rocky-AppStream" \ + "Rocky-BaseOS" \ + "Rocky-Debuginfo" \ + "Rocky-Devel" \ + "Rocky-Extras" \ + "Rocky-HighAvailability" \ + "Rocky-NFV" \ + "Rocky-Plus" \ + "Rocky-PowerTools" \ + "Rocky-RT" \ + "Rocky-ResilientStorage" \ + "Rocky-Sources" + ;; *) ;; esac - spcd_os_sed "${spcd_spr__file}" \ - "|^mirrorlist|# mirrorlist|" \ - "|http://dl.rockylinux.org/\$contentdir|${SPCD_URL_ROCKY}|" \ - "|^#baseurl|baseurl|" + for spcd_spr__file in "${@}"; do + spcd_os_sed "/etc/yum.repos.d/${spcd_spr__file}.repo" \ + "|^mirrorlist|# mirrorlist|" \ + "|http://dl.rockylinux.org|${SPCD_URL_ROCKY}|" \ + "|^#baseurl|baseurl|" + done ;; "${SPCD_OS_UBUNTU}") spcd_os_write "/etc/apt/sources.list" "\