saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Debian 11 (bullseye/testing) support using Debian 10 packages

Browse source
This commit is contained in:
Joseph Pacura 2020-12-04 17:15:02 -05:00 • committed by Pedro Algarvio
parent 11a0c6fee0
commit 4c1903f004
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README.rst
View file

@ -300,9 +300,9 @@ repositories are not provided on `SaltStack's Debian repository`_ for Debian tes
However, the bootstrap script will attempt to install the packages for the current stable However, the bootstrap script will attempt to install the packages for the current stable
version of Debian. version of Debian.
For example, when installing Salt on Debian 10 (Buster), the bootstrap script will setup the For example, when installing Salt on Debian 11 (Bullseye), the bootstrap script will setup the
repository for Debian 9 (Stretch) from `SaltStack's Debian repository`_ and install the repository for Debian 10 (Buster) from `SaltStack's Debian repository`_ and install the
Debian 9 packages. Debian 10 packages.
Red Hat family Red Hat family

18
bootstrap-salt.sh
View file

@ -900,6 +900,8 @@ __derive_debian_numeric_version() {
NUMERIC_VERSION=$(__parse_version_string "9.0") NUMERIC_VERSION=$(__parse_version_string "9.0")
elif [ "$INPUT_VERSION" = "buster/sid" ]; then elif [ "$INPUT_VERSION" = "buster/sid" ]; then
NUMERIC_VERSION=$(__parse_version_string "10.0") NUMERIC_VERSION=$(__parse_version_string "10.0")
elif [ "$INPUT_VERSION" = "bullseye/sid" ]; then
NUMERIC_VERSION=$(__parse_version_string "11.0")
else else
echowarn "Unable to parse the Debian Version (codename: '$INPUT_VERSION')" echowarn "Unable to parse the Debian Version (codename: '$INPUT_VERSION')"
fi fi
@ -1555,6 +1557,9 @@ __debian_codename_translation() {
"10") "10")
DISTRO_CODENAME="buster" DISTRO_CODENAME="buster"
;; ;;
"11")
DISTRO_CODENAME="bullseye"
;;
*) *)
DISTRO_CODENAME="jessie" DISTRO_CODENAME="jessie"
;; ;;
@ -3339,8 +3344,17 @@ install_ubuntu_check_services() {
# Debian Install Functions # Debian Install Functions
# #
__install_saltstack_debian_repository() { __install_saltstack_debian_repository() {
DEBIAN_RELEASE="$DISTRO_MAJOR_VERSION" if [ "$DISTRO_MAJOR_VERSION" -eq 11 ]; then
DEBIAN_CODENAME="$DISTRO_CODENAME" # Packages for Debian 11 at repo.saltstack.com are not yet available
# Set up repository for Debian 10 for Debian 11 for now until support
# is available at repo.saltstack.com for Debian 11.
echowarn "Debian 11 distribution detected, but stable packages requested. Trying packages from Debian 10. You may experience problems."
DEBIAN_RELEASE="10"
DEBIAN_CODENAME="buster"
else
DEBIAN_RELEASE="$DISTRO_MAJOR_VERSION"
DEBIAN_CODENAME="$DISTRO_CODENAME"
fi
__PY_VERSION_REPO="apt" __PY_VERSION_REPO="apt"
if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then