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

Merge branch 'develop' into develop

Browse source
This commit is contained in:
Pedro Algarvio 2019-10-15 13:00:16 +01:00 • committed by GitHub
commit 3a8bd84920
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bootstrap-salt.sh
View file

@ -891,7 +891,6 @@ __derive_debian_numeric_version() {
elif [ "$INPUT_VERSION" = "stretch/sid" ]; then
NUMERIC_VERSION=$(__parse_version_string "9.0")
elif [ "$INPUT_VERSION" = "buster/sid" ]; then
# Let's start detecting the upcoming Debian 10 (Buster) release
NUMERIC_VERSION=$(__parse_version_string "10.0")
else
echowarn "Unable to parse the Debian Version (codename: '$INPUT_VERSION')"
@ -3061,17 +3060,8 @@ install_ubuntu_check_services() {
# Debian Install Functions
#
__install_saltstack_debian_repository() {
if [ "$DISTRO_MAJOR_VERSION" -eq 10 ]; then
# Packages for Debian 10 at repo.saltstack.com are not yet available
# Set up repository for Debian 9 for Debian 10 for now until support
# is available at repo.saltstack.com for Debian 10.
echowarn "Debian 10 distribution detected, but stable packages requested. Trying packages from Debian 9. You may experience problems."
DEBIAN_RELEASE="9"
DEBIAN_CODENAME="stretch"
else
DEBIAN_RELEASE="$DISTRO_MAJOR_VERSION"
DEBIAN_CODENAME="$DISTRO_CODENAME"
fi
DEBIAN_RELEASE="$DISTRO_MAJOR_VERSION"
DEBIAN_CODENAME="$DISTRO_CODENAME"
__PY_VERSION_REPO="apt"
if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then