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

Add debian_codename_translation function, similar to Ubuntu

Browse source 
Fixes #1083

This is a simpler function than the one needed for the Ubuntu
codename translations, but will still be helpful moving foward
with Debian support as Debian 9 comes out.
This commit is contained in:
rallytime 2017-06-12 16:45:43 -06:00
parent 9f92fbe5e6
commit a7c251f8f4
1 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
bootstrap-salt.sh
View file

@ -1443,6 +1443,27 @@ __debian_derivatives_translation() {
}
#--- FUNCTION -------------------------------------------------------------------------------------------------------
# NAME: __debian_codename_translation
# DESCRIPTION: Map Debian major versions to their corresponding code names
#----------------------------------------------------------------------------------------------------------------------
# shellcheck disable=SC2034
__debian_codename_translation() {
case $DISTRO_MAJOR_VERSION in
"7")
DISTRO_CODENAME="wheezy"
;;
"8")
DISTRO_CODENAME="jessie"
;;
*)
DISTRO_CODENAME="jessie"
;;
esac
}
#--- FUNCTION -------------------------------------------------------------------------------------------------------
# NAME: __check_end_of_life_versions
# DESCRIPTION: Check for end of life distribution versions
@ -1687,6 +1708,9 @@ fi
# For ubuntu versions, obtain the codename from the release version
__ubuntu_codename_translation
# For debian versions, obtain the codename from the release version
__debian_codename_translation
# Only Ubuntu has daily packages, let's let users know about that
if ([ "${DISTRO_NAME_L}" != "ubuntu" ] && [ "$ITYPE" = "daily" ]); then
echoerror "${DISTRO_NAME} does not have daily packages support"
@ -2912,17 +2936,18 @@ install_ubuntu_check_services() {
# Debian Install Functions
#
__install_saltstack_debian_repository() {
if [ "$DISTRO_MAJOR_VERSION" -eq 7 ]; then
DEBIAN_CODENAME="wheezy"
DEBIAN_RELEASE="$DISTRO_MAJOR_VERSION"
else
DEBIAN_CODENAME="jessie"
if [ "$DISTRO_MAJOR_VERSION" -eq 9 ]; then
# Packages for Debian 9 at repo.saltstack.com are not yet available
# Set up repository for Debian 8 for Debian 9 for now until support
# is available at repo.saltstack.com for Debian 9.
DEBIAN_RELEASE="8"
else
DEBIAN_RELEASE="$DISTRO_MAJOR_VERSION"
fi
# amd64 is just a part of repository URI, 32-bit pkgs are hosted under the same location
SALTSTACK_DEBIAN_URL="${HTTP_VAL}://${_REPO_URL}/apt/debian/${DEBIAN_RELEASE}/${__REPO_ARCH}/${STABLE_REV}"
echo "deb $SALTSTACK_DEBIAN_URL $DEBIAN_CODENAME main" > "/etc/apt/sources.list.d/saltstack.list"
echo "deb $SALTSTACK_DEBIAN_URL $DISTRO_CODENAME main" > "/etc/apt/sources.list.d/saltstack.list"
if [ "$HTTP_VAL" = "https" ] ; then
__apt_get_install_noinput apt-transport-https ca-certificates || return 1